only use PDFs
Except for when some corporate update screws the install up, and I can't read PDFs ever again.
only use PDFs
Except for when some corporate update screws the install up, and I can't read PDFs ever again.
I was hoping for something simpler, I suck at git
This would give you a chance to learn without destroying anything important. </nothelping>
Build an example repo with what could happen in theory, then use Git GUI, Eclipse's history tool, or your preferred history tool.
Also, Visio.
I don't know what that means. How do you get "prompted" with a text file?
When the CLI command is run, vi is initialized automatically with the text file to be edited.
... have I mentioned recently how many people tell me Git is a good high-quality tool? Christ.
I know that I'm not one of them. However, I do understand how it works even if it makes me want to find the developers would made it, especially the ones who wrote the docs, and slowly beat them to death with a spoon.
... ok? So you can do this on the remote branch?What happens to the new set of commits? Do I just need to "push" them back to the remote, or do they need to go into a new branch or...?
On the branch you want to clean up commits:
$ git rebase -i HEAD~n
where n is the number of commits back in history, starting with the most recent (HEAD), you want to change. 2 would get you the top 2 commits, 3 would get you 3, etc.
It will prompt you with a commit message text file that you can edit which will tell the rebase command what to do with each commit.
Then do:
$ git push origin branchname --force
Note that lots of remotes reject forced pushes that rewrite history like this, because, as has been mentioned several times in this thread already, it is dangerous. For instance, if you did
$ git push --force 'Do not do this'
instead, it will rewind the histories of every local remote-tracking branch that you have, for which you haven't done a pull while on that branch recently. tmg;dr It deletes work.
The point of doing this is so the pull request is clean. Nobody would be pulling this branch until it's in pull request form.
You should be ok then. As long as you don't screw something up.
The StackOverflow link implies that opens a text file? Which I then edit somehow?Isn't there just a GUI for this in some tool?
Yes, it opens a text file. Yes, if you are using the git Bash tool that installs as part of some git Windows installs, it comes up it in vi. You read that right, you are using vi in bash in Windows to edit git commits. No, there is no GUI for this that I know of.
Do you?
It's all lost for good, I get it, and I understand why you make so many commits. I'd do the same thing. But then I'm not as anal about making the commit history read like a novel like your boss, and would accept your workflow as is.
I did have an alternate solution, but...
Atlassian Stash doesn't allow that; every commit has to be attached to a Jira ticket. Even if it did, it doesn't solve the problem because:
I have no idea what that means or how to do it.
Reading about your constraints with git before, I was expecting as much. So I didn't put as much effort into making the alternate solution understandable as I should, because I didn't want to waste too much of your and my time with a solution you couldn't use anyway.
git rebase -i origin/your-remote-branch
It means you are interactively "rebasing" (restructuring commits - squashing them together, dropping them completely, even editing them and their messages - into a new set of commits with new hashes) the remote branch. Anyone who has the old commits you already pushed or has merged them in different branches could have problems (e.g. merge conflicts, or the commits could continue to exist in other remote branches or other user's local branches). Hopefully this answered some of your questions above and was less gibberish.
how the hell do you combine commits on a remote branch
You can, maybe... but you shouldn't. Rewriting remote history can be really, really bad. I'm sorry if this isn't helpful, but combining remote commits could seriously ruin someone else's day.
The better practice is to "squash" (Definition: turning multiple commits into one) all the local commits before you push them, if you can.
As an alternate solution, maybe you could get a remote branch for your personal use that's just scratch space? Then you could cherry-pick and squash all the commits for a given task onto the local version of the legitimate target branch before pushing.
Filed Under: Gibberish
@FrostCat, Looks like you're looking for a reverse proxy. How about this?
Why did this die? Things were starting to pick up steam then... nothing. Did Jeff send a Cease & Desist or something?
I'm more saying that business goals (new versions/products), personal goals (leaving for another job/project), and personal preferences (which refactor is best) trump long-term technical goals more often than not, especially when the technical goals do not align or are not justified by those three items.
Attempting a long-term technical goal within a business setting without considering the non-technical elements that could make it a waste of time is foolish.
Speaking, to the third item (personal preference), I prefer code that is OK and consistent to code that is OK with some Excellent that's inconsistent, because that's harder to understand. Perhaps you disagree?
On the other hand, if something is already Bad and inconsistent, then, whether or not it's ever completed, I'd accept that refactoring certainly couldn't make things worse. Or could it?
That's why you refactor as you go.
It works for all values of 1 times 1, and n times 0!
Perfect! My computer only uses 0's and 1's anyway.
anything useful
Define useful. Tracking achievements, managing purchases, having an avatar, and having a friend's list (even if you can't play with them) are all part of the Silver account.
Silver accounts are, but you need a Gold account to play games online; that costs cash money
Don't tell me. Tell the guy who thought he had to pay.
Sounds like you are addicted and are min/maxing SO. Why don't you put SO down for a while and try something different and less addicting, such as WoW?
Logical operations are not mathematical operations.
I was being half-facetious, but I'll defend my statement anyway. At least one of us (hopefully) will learn something that way.
AND Gate
Note the word "Gate" a physical construct built out of transistors. At the lowest level (that I know of - the IC/Gate/CPU level, don't know what to call it), all mathematical operations are composed of logical ones. In this case, I was pointing out that a logical AND has the same properties as multiplication. At least for a single digit. I have no idea how to or even if it extends to multiple digits.
all mathematical operations a computer does are addition.
What about multiplication?
AND Gate
1 * 1 = 1
1 * 0 = 0
0 * 1 = 0
0 * 0 = 0
Patent for Incrementing an Numeric Identification Value by the smallest Integer Difference
Example A
1 Item
2 Item
3 Item
Example B
Patent No. 2358233
Patent No. 2358234
Patent No. 2358235
Invention Description
Having initial value i0 assigned to initial item x0, for each subsequent item x1, x2, x3, ..., xn, assign in to said item, defining in as i0 + n.
Sounds boring. We should have machines to do that for us.
What if the machine solves differential equations too?
programming is just addition
Addition of just two different numbers over and over again at that!
Can you imagine the world where Microsoft's CLI stuff is just as good (or better) than Linux? Or where Windows adopts some kind of nix interop / nix like shell / bash compatibility layer / whatever?
not if you use HTTPS
SHHHH! It's supposed to be a secret! If IT finds out, they'll just take away the whole Internet!
@abarker said:CAARS™. It's Clouds all the way down.And that
abbreviationinitialismacronym makes me think of KARR.FTFM
FTFY
Technically still an abbreviation.
acronym = an abbreviation pronounced as if it were a word, e.g., SARS = severe acute respiratory syndrome, pronounced to rhyme with cars
initialism = an abbreviation pronounced wholly or partly using the names of its constituent letters, e.g., CD = compact disc, pronounced cee dee
Considering I don't participate in the SO community, it is of the same usefulness as it has always been. Easy place to find several answers to common questions and sometimes even an answer to a more esoteric question.
I want to thank everyone who made this badger possible.
@sloosecannon for taking the bait.
@RaceProUK for silently supporting the decision.
@loopback0 for jumping on the bandwagon
And last, but not least:
@boomzilla for DOING HIS JOB.
And I shall wave these flags in the face of those who thought it couldn't be done (@Polygeekery, @HardwareGeek).
You can fake that out in all kinds of ways including HTML comments, btw.
You Must Be New HereTM
Obviously, I am still too new here.
Not empty
Too bad you couldn't work some pendantry in there.
On other forums, pedantry and dickweediness are frowned upon.
Here I get called out if I don't have enough of one or the other.
Obviously, I am still too new here. I'm sure one day I'll learn and make a post worthy of those badgers and pedantic dickweed admirers everywhere.
Also, it's pedantry, not pendantry.
Let them eat whooshes. -b
That led to an amusing conversation between myself and the salesperson:"These numbers are available, do you have any preference?"
"I don't give a shit, I am not even going to hook a phone up to it."
"ooooooook?"
That's amusing? It must be one of those "you had to be there" stories.
haven't seen the book, but the blog it's really good.
The book is just the blog with half a dozen to a dozen book-only articles. It also comes with some nice dust jacket art and lists of crazy reader questions that Randall wouldn't answer. Finally, it is localized for your convenience (e.g. color vs. colour).
This thread broke IE 11 around post 5 or 6. What black magic is happening in this thread? I MUST KNOW
abuse of both XML and CSV
And an abuse of Oracle tables. But I'm sure at least Oracle did something to deserve it.
Checkmate
My destiny was to post on this forum. All my years of training in being overly sensitive to semantics, details, and nuance have finally paid off.
object != null && object.getSomething() != null
vs.
object.getSomething() != null && object != null
Evaluation of the operator is commutative
Evaluation and side effects of the operand expressions are not