Re: [git-users] Interactive rebase with reword after conflict

[Magnus Therning]

Dániel Vörös <daniel.vo...@gmail.com> writes:
[..]

Can someone please explain what's going on here? My assumption was that after rebasing, HEAD will always be a descendant of the target

commit, but this seems to be wrong in this case.

you describe on my machine as well. Also, I have to admit that my
expected behaviour matches expected behaviour.


see what I expect.

/M

--
Magnus Therning              OpenPGP: 0x927912051716CE39
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus


    — 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 git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Nope, I have no explanation. I can just affirm that the behaviour is as Interestingly, if I *don't* choose to 'reword', but just to 'pick', the merge conflict happens (as expected) and after `git rebase --continue` I You can't depend on your judgement when your imagination is out of focus.

signature.asc
Description: PGP signature