> From: "Philip Oakley" <philipoak...@iee.org>
> Is this what they call an 'Evil Merge' (git style) where the final
> content was not in either of the original commits.
> In such cases it's hard to attribute which source commit contained
> the data that is in the merge.
> It's as if an additional change was added, over and above choosing
> between which of the source commit changes should 'win' when line
I can understand that; I've had similar attitudes toward merges using
Subversion. But in practice, in real software development, you
sometimes need to make additional changes to make a merged version
work. And Git (like any other system) does properly record those
additional changes. The problem is that "git rebase" doesn't seem to
check for those changes when it is reconstructing a branch.
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
For more options, visit https://groups.google.com/groups/opt_out.