SyntaxFix
Write A Post
Hire A Developer
Questions
I would also suggest the following command if you are working on a local git repository or in a directory in which patch -p1 --merge < ... was applied.
patch -p1 --merge < ...
grep -rnw . -e '^<<<<<<<$'