Diff/Merge
From Hash, Inc. WIKI
If you are using TortoiseSVN on the PC with SVN then see its help file on conflicts.
When an SVN conflict occurs there are three temp files created
- file.ext.rx
(origional file) - file.ext.rx+1
(recived file) - file.ext.mine
(your file)
file.ext has file.ext.rx+1 and file.ext.mine merged as well as it can with conflicts marked with <<<<<<<
To before you can mark the file.ext’s conflict resolved you need to merge .rx+1 and .mine into file.ext
You can fix file.ext with a text editor by searching for “<<<<<<<” see Svn Conflict.
But the best way is to use Tortoise’s “Edit Conflicts” option if you are on the PC or…
If you are on OSX or are not using tortoise you’ll need a tool like KDiff3
KDiff3
file.ext.rx should be file A
file.ext.rx+1 should be file B
file.ext.mine should be file C