April 2026 Summaries

Merge conflicts in Git arise when two branches alter the same part of a file in different ways, preventing Git from automatically deciding which change to keep. Understanding merge conflicts involves grasping the concept of three versions: ours, theirs, and base. The base represents the common ancestor commit before branches diverged, ours is the version on the branch receiving the merge, and theirs is the version from the branch being merged in. Conflicts are less frequent when modifications occur in different parts of a file, allowing Git to merge changes seamlessly. To resolve conflicts, users can either accept one side entirely using Git shortcuts or manually edit files, often aided by visual tools that display all three versions—ours, theirs, and base—side by side, facilitating a more intuitive resolution process. The terms ours and theirs originate from the Unix utility diff3, and while they might seem counterintuitive, they denote the branches accepting and providing changes, respectively.