Dániel Vörös <[email protected]> writes: [..]
Can someone please explain what's going on here? My assumption was that after rebasing, HEAD will always be a descendant of the targetcommit, but this seems to be wrong in this case.
Nope, I have no explanation. I can just affirm that the behaviour is as
you describe on my machine as well. Also, I have to admit that my expected behaviour matches expected behaviour.Interestingly, if I *don't* choose to 'reword', but just to 'pick', the merge conflict happens (as expected) and after `git rebase --continue` I
see what I expect. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: [email protected] jabber: [email protected] twitter: magthe http://therning.org/magnusYou can't depend on your judgement when your imagination is out of focus.
— Mark Twain
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: PGP signature
