Git - How do I find where the merge conflict is in a big file

Questions

I have a file that has 6000 lines and have scanned it over and over again but do not see the merge conflict. How else can I find it?

Answers

You can always try using

 git mergetool

For me, this will launch BeyondCompare for each file that has conflicts, which shows both files used in the merge and the conflicts that you can easily resolve. What it launches depends on the diff tool that you have.

Source

License : cc by-sa 3.0

http://stackoverflow.com/questions/38274395/how-do-i-find-where-the-merge-conflict-is-in-a-big-file

Related