A conflict occurs when you update a file, and changes from the repository conflict with changes local to your working copy. (Incidentally, this can happen even with only one person working in a repository; I've occasionally made changes to fix different things in different working copies, then had to resolve where they overlap.)
When a conflict occurs, Subversion automatically creates 3 auxiliary files and
changes the original file. Your task is to manually modify the versioned file
by removing conflicts. If you have a file README.txt, here are the files you'll
see when a conflict occurs: (X and Y are revision numbers, where X < Y)
• README.txt – the original file, with conflict markers added
• README.txt.mine – your version with local modifications
• README.txt.rX – the original your worked with
• README.txt.rY – the more recent version from the repository
The original file (README.txt) will have conflicts delineated with <<<<<<< /
======= / >>>>>>> markers. You need to figure out which changes to keep and let
Subversion know you have resolved the conflict. For a more detailed description
of how to get rid of such conflicts, refer to these links.
http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve
http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve.byhand
BOTTOM LINE: Subversion isn't letting you commit because it still believes
there is a conflict. Once you have fixed the conflicts, you can either (1) use
the 'svn resolve' command (in Versions, select the resource and click Resolve
in the toolbar, or (2) delete the 3 extra files manually.
Hope this helps,
- Quinn
On Feb 13, 2011, at 2:10 PM, avidaicu wrote:
> Hi,
>
> Just wondering how I am able to resolve this, see below (ie resolve
> files that are in conflict, as I am not the only one working on this
> project).
>
> Commit failed (details follow):
> Aborting commit: '/Applications/MAMP/htdocs/countryhomeideas/sites/all/
> themes/city_magazine/css/city_magazine.css' remains in conflict
>
> kind regards,
> Andrei
>
> --
> You received this message because you are subscribed to the Google Groups
> "Versions" group.
> To post to this group, send email to versions@googlegroups.com.
> To unsubscribe from this group, send email to
> versions+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/versions?hl=en.
>
smime.p7s
Description: S/MIME cryptographic signature
