Merge Conflicts

Overview

Merge conflicts are denoted by <<<<<<<, =======, and >>>>>>> markers.

Bibliography

• Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).