References: Merge conflicts

Primary sources

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.

Secondary sources

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/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts. Licensed under Creative Commons Attribution 4.0. Covers the GitHub-specific UI for resolving conflicts in the browser.

Further reading

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

On semantic conflicts (deeper treatment): Martin Fowler’s blog 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.

On AI-agent conflict patterns: as of mid-2026, there is no canonical reference for multi-agent merge conflicts in production codebases. The Clawless 2026-06-04 sprint documentation (referenced in this track’s Phase 0) is one early example; expect more public references over the next year as multi-agent workflows mature.

What this lesson does not cite

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 the consensus across the literature.

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.

License of this lesson

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.