Detect git Conflict Markers

added by DotNetKicks
1/4/2017 3:49:39 PM

1 Kicks, 271 Views

This is post 2 of 2 in the series "Developer Tips" Tips for developers, archived from Dev Tips Weekly emails. 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.


0 comments