Merge conflicts, they are bound to happen sooner or later when you are working in parallel with a team of developers. When Git cannot automatically merge changes, a merge fails and the conflicted file becomes littered with <<<<<<<, =======, and >>>>>>> markers.  To ease the pain of having to performing merges, Git allows using one [...]