Evil merges in git?

by

Because it’s putting things in the code that no one ever asked to be there. As if you had this code:

$foo = bar;
$baz = qxx;

and this change:

$foo = bar;
$foo++;
$baz = qxx;

got merged with this change:

$foo = bar;
$foo--;
$baz = qxx;

in a fashion that somehow produced:

$foo = bar;
$foo++;
$foo--;
--$baz;
$baz = qxx;

Clearly, this is evil.

I would guess that it’s of enough concern to be in man gitglossary because the more involved your merging algorithms are, the more likely it is that they will produce such a thing.

More Related Contents:

  1. How to merge a specific commit in Git
  2. When would you use the different git merge strategies?
  3. How to import existing Git repository into another?
  4. What’s the difference between ‘git merge’ and ‘git rebase’?
  5. How can I prevent foxtrot merges in my ‘master’ branch?
  6. What’s the best visual merge tool for Git? [closed]
  7. `git merge -s theirs` needed but it does not exist
  8. Git Cherry-pick vs Merge Workflow
  9. Can I make fast forwarding be off by default in git?
  10. How do I merge changes to a single file, rather than merging commits?
  11. Merge changes from remote github repository to your local repository
  12. git merge: Removing files I want to keep!
  13. How do I use `git rebase -i` after `git merge` without messing things up?
  14. Making Git retain different section content between branches
  15. Git: Merge to master while automatically choosing to overwrite master files with branch
  16. How to “git show” the diffs for a merge commit?
  17. Git: merging public and private branches while while keeping certain files intact in both branches
  18. How would I write a pre-merge hook in Git?
  19. Are there any downsides to enabling git rerere?
  20. How to rebase one Git repository onto another one?
  21. Error “Updates were rejected because the remote contains work that you do not have locally”
  22. What to do with branch after merge
  23. Tell git not to merge binary files but to choose
  24. git: How do I add a custom merge strategy?
  25. Git: Merge a Commit into a different Branch
  26. How do I make git merge’s default be –no-ff –no-commit?
  27. How to perform a three-way diff in Git without merging?
  28. git subtree: possible to change subtree branch/path in a forked repository?
  29. Whats the Proper usage of .gitattributes with merge=ours
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment