resolving simple svn conflicts

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.