2 ms·
For a start, lines like: "At this point solve any conflicts that come out of the rebase" Hide (in my experience) huge amounts of complication -- this can get
by CJefferson 13y ago
For a start, lines like:
"At this point solve any conflicts that come out of the rebase"
Hide (in my experience) huge amounts of complication -- this can get very hairy, and it isn't discussed at all how you do it (and it's more complex than any of the rest of the stuff shown here).
- baq 13y agoperhaps because it's not in any way different than "At this point solve any conflicts that come out of the merge"? isn't conflict resolution usually done on a case-by-case basis?
- lmm 13y agoSo if you e.g. want to abandon the conflict-fixing, and do some things on your branch to make merging easier first, you've got to use a special command, and it's different depending on whether you were merging or rebasing (which is still a great improvement over a year or so ago, when you had to do an incantation like git reset --hard HEAD^). Contrast with svn where abandoning a merge is just a "svn revert" like any other.