Evil merges in git - where do they come from?

Question

I\'ve read this question and the answers, but what isn\'t clear to me is WHO creates the \"changes that do not appear in any parent\".

Is it the git merge algorithm

Answer 1

It happens when a developer has a merge conflict that he must manually fix, and in doing so, he changes code that is not related to the merge conflict itself. Git's merging algorithms will not insert unrelated, "evil" code changes by itself.