resolving simple svn conflicts
I'm a bit of newcomer to using svn on a mac. I'm using Versions.
I've been getting reports that I've been overwriting other devs work, so I'm hoping someone here can make sure I'm doing things properly.
I committed my work last night, the other team members have been working through the night so the first thing I do today is update my repository.
After doing so I receive various files back, I'll use the css file as an example:
myfile.css.r1593
myfile.css.r1587
myfile.css.mine
myfile.css
I have a few questions.
What do each of these files represent?
How should I go about fixing the conflict?
What is the safest way for me to work with svn to avoid overwriting other peoples work and avoid making unnecessary copies of files outside of the repo?
Answer
The myfile.css.rXYWZ represent the myfile.css at XYWZ revision.
The .mine file is your original file.
When the file is in conflict in the original file (myfile.css) some markers are added.
To fix the conflict, usually you need to check the files that are marked with conflict and see the differences inside.
Usually your part is marked <<<<<<< .mine
The repository part is marked with >>>>>>> .rXYWZ.
Resolve manually the conflict, remove the mine and rXYWZ lines and then type:
svn resolved myfile.css
and then you can commit your file.