问题
I am having trunk and one branch. I have updates in both and I want to merge trunk changes to branch. And all files merges correcty, but one is marked as conflict. The problem is that I cant merge them because svn marks all lines as different. How can I solve this?
svn diff on that file in trunk and branch also shows all file lines as different.
My server svn version: svnserve, version 1.8.5 (r1542147)
compiled Jan 13 2014, 03:38:23 on i486-pc-linux-gnu
My client svn version: svn, version 1.8.5 (r1542147)
compiled Dec 2 2013, 16:38:04 on i686-pc-linux-gnu
回答1:
This was EOL problem. I did not changed svn:eol-style or used different os, that is why I didn't checked it before. But using svn merge ^/trunk -x "-w --ignore-eol-style" solved my problem (Thanks to @Lindydancer).
来源：https://stackoverflow.com/questions/22981933/svn-1-8-5-marks-entire-files-as-conflicted