Evil merges in git - where do they come from? -

I have this question and answer, but I do not know WHO "who do not make changes in any origin "

Is it to screw the guitar merge algorithm?

Or is it because the user has to manually adjust the conflict so that he can present a new code to create the thing which is either parent?

It is explained in the first commentary of the correct. You can merge without a committed (either through conflict or without-commit) and then add additional changes before merging.

Note that solving the merge dispute is not bad; you choose only the code exists on one or both sides of the conflict. If you add some code that does not exist on any side, then you merge now Has changed the situation.