Merge Conflicts

Important

• You start with the simplest case: a merge conflict.
• You see how conflicts are non-blocking.
• Finally, you learn to read conflict markers and resolve them.

Focus on Changes nz and m:

○  nz        **merge-b**
│ ○  m         **merge-a**
├─╯
○  vr       Base of merge-a and merge-b
│
~

Their shared base vr contains a text file with:

We will create a conflict here.

merge-a changes this to:

We will create a conflict here: merge-a added this text.

merge-b instead to:

We will create a conflict here: merge-b added this text.

Since these changes are incompatible, merging them will result in a conflict. Exactly what we want!