What constitutes a merge conflict in Git?

by

Basically, with git, every merge is a conflict, which leaves you with an index that contains three versions of each file, the versions from each branch and the base. On this index, various resolvers are run, which can decide for each individual file how to resolve the matter.

The first stage is a trivial resolver, which takes care of things like unchanged files, cases where one branch has modified a file while the other didn’t, or where both branches contain the same new version of the file.

Afterwards, it’s plugins that look at the remaining cases. There is a plugin that handles text files by identifying individual changes (like diff) in one branch and trying to apply those to the other branch, falling back on placing conflict markers if that doesn’t work. You can easily hook in your own merge tool at this point, for example, you could write a tool that knows how to merge XML files without violating well-formedness, or that gives a graphical user interface that allows interactive editing and a side-by-side view (for example, kdiff3 does that).

So the presentation of conflicts is really a matter of the plugin used; the default plugin for text files will use the same style as CVS did, because people and tools are used to it, and the conflict markers are a known syntax error in almost any programming language.

More Related Contents:

  1. What does the git index contain EXACTLY?
  2. Are Git’s pack files deltas rather than snapshots?
  3. Can I ‘git commit’ a file and ignore its content changes?
  4. After $git push -u origin main command, Git bash is not requesting any authentication literally does nothing
  5. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  6. Git sparse checkout with exclusion
  7. Show just the current branch in Git
  8. Start a Git commit message with a hashmark (#)
  9. Keep file in a Git repo, but don’t track changes
  10. What is the difference between “git init” and “git init –bare”?
  11. Skip Git commit hooks
  12. How to add chmod permissions to file in Git?
  13. How to remove files that are listed in the .gitignore but still on the repository?
  14. Git – Ignore node_modules folder everywhere
  15. In Git, how can I write the current commit hash to a file in the same commit
  16. Why am I getting the message, “fatal: This operation must be run in a work tree?”
  17. Git workflow – Setting up a build process
  18. What are some more forceful ways than a .gitignore to keep (force) files out of a repository?
  19. VS 2015 + Bower: Does not work behind firewall
  20. git diff between cloned and original remote repository
  21. git: switch branch without detaching head
  22. How do I replace a git submodule with another repo?
  23. Deploying GitLab pages for different branches
  24. Powershell with Git Command Error Handling – automatically abort on non-zero exit code from external program
  25. How do you cancel an external git diff?
  26. How do I stop Git from tracking any changes to a file from this commit forward?
  27. ! [remote rejected] errors after mirroring a git repository
  28. SourceTree App says uncommitted changes even for newly-cloned repository – what could be wrong?
  29. Git rebase –preserve-merges fails
  30. How do I write a batch file which opens the GitBash shell and runs a command in the shell?

Leave a Comment