Detect git Conflict Markers

Detect git Conflict Markers

This is post 2 of 2 in the series “Developer Tips” If you’re using git, you’ve probably run into a problem at some point where you’ve had to perform a merge, and a merge conflict resulted. This happens when two different commits changed the same line in a file, and git can’t tell which commit […]