Reputation: 4993
After a merge of branches, I get a lot of conflicts like these:
<<<<<<< .working
return $sql;
=======
return $sql;
>>>>>>> .merge-right.r37555
...where I can not see real differences. Why is SVN giving me these?
Upvotes: 2
Views: 74
Reputation: 19797
Check your whitespaces and line endings. (Tab vs. Space, CRLF vs. LF)
You could do that with vim, :se list
is used to display all characters. :se nolist
turns it off again.
Upvotes: 1