I have a branch of trunk that I'm doing some work it. Someone committed changes to ^/trunk that I wanted, so I ran "svn merge ^/trunk" in a wc of my branch.
One of the files had a conflict, and I postponed resolution. I opened the myfile.merge-left.r* and found the old version of the file. I opened myfile.working and found what is currently in my branch. But when I opened myfile.merge-right.r*, the contents didn't match any version of the file I can find. None of the myfile.* files match what is in ^/trunk. I thought the myfile.merge-right.* file was supposed to be a copy of the file from ^/trunk. Can someone help me understand this? What gets put in the merge-right file? Thanks, Abrahm
