Skip to content

References: Merge conflicts

Pro Git by Scott Chacon and Ben Straub. Chapter 3 section 3.2 (Basic Branching and Merging), which contains the canonical "Basic Merge Conflicts" treatment. Licensed under Creative Commons Attribution Non Commercial Share Alike 3.0 Unported.

Read online at git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging.

Pro Git's section on "Basic Merge Conflicts" introduces the marker syntax and resolution process. The lesson body's worked examples are influenced by Pro Git's framing but expanded with the five-conflict-type taxonomy.

Git documentation on merge at git-scm.com/docs/git-merge, the authoritative reference. The "HOW CONFLICTS ARE PRESENTED" section documents the marker syntax including diff3. The same page documents that ort is the default strategy when merging one branch, and that an abort may be unable to reconstruct uncommitted changes that were present when the merge started.

Git documentation on rename detection: the find-renames option of git diff documents the default similarity index of 50 percent that decides whether a delete plus add counts as a rename.

Atlassian Git Tutorials, "Resolving merge conflicts" section at atlassian.com/git/tutorials/using-branches/merge-conflicts. Licensed under Creative Commons Attribution 2.5 Australia.

Atlassian's tutorial is shorter than Pro Git's treatment but useful as a second voice; some learners click with one framing more than another.

GitHub Docs, About merge conflicts at docs.github.com/en/pull-requests/reference/merge-conflicts. Licensed under Creative Commons Attribution 4.0. The companion page Resolving a merge conflict on GitHub states that the browser editor handles only simple competing line change conflicts; other conflicts go to the command line.

VS Code documentation, Merge conflicts at code.visualstudio.com/docs/sourcecontrol/merge-conflicts. Documents the inline accept actions, the Resolve in Merge Editor button, and the optional base view.

On the diff3 conflict style: the git documentation on merge.conflictStyle covers diff3, zdiff3, and the default merge style options. zdiff3 arrived in Git 2.35.

On semantic conflicts (deeper treatment): Martin Fowler's post "Semantic Conflict" is widely considered the canonical reference. Highly recommended for teams whose semantic-conflict rate is becoming a problem.

On conflict prevention via continuous integration: any introduction to "trunk-based development" covers the philosophy. The trunkbaseddevelopment.com site is a useful primer; we'll revisit in L9.

L7 does not yet cite specific company case studies on merge conflict rates. Many engineering blogs touch on the topic; none has emerged as canonical. The patterns in L7 are common practice drawn from the sources above. The six-agent team in the multi-agent scenario is an illustrative example, not a reported case.

L7 also does not cite specific git GUI clients (Sourcetree, GitKraken, Tower) beyond the brief mention. These tools come and go; the underlying git mechanics are stable.

This lesson is part of the Clawdemy curriculum, licensed under Creative Commons Attribution NonCommercial Share Alike 4.0 International. Pro Git's CC BY-NC-SA 3.0 license and Clawdemy's CC BY-NC-SA 4.0 license are directly aligned (the 4.0 license is an approved compatible adaptation license for 3.0 source material per the 3.0 license's later-versions provision). Commercial use is licensed separately at /legal/licensing.