Conflict Resolution

Why Conflicts Happen

A conflict occurs when update or merge applies remote changes to lines you already modified locally. SVN refuses to choose for you and marks the file with conflict markers.

<<<<<<< .working
your version of the line
=======
their version of the line
>>>>>>> .merge-right.r42

The Three Files

When a conflict appears, SVN writes three companion files: your .working version, the .merge-right.rNN pristine revision, and .mine (your pre-merge copy). Review them to understand both changes.

Resolve Manually

Edit the file, remove the markers, then tell SVN the file is resolved:

svn resolve --accept=working file.txt

Automatic Acceptance

For quick cases use pre-packaged answers: --accept=mine-full keeps your.txt version, --accept=theirs-full keeps theirs, --accept=working keeps your merged edits.

Preventing Conflicts

• Update frequently while working.
• Communicate who touches which files.
• Commit small, atomic changes.
• Set svn:needs-lock on shared binaries.

Key Points

• Conflicts need manual or scripted resolution.
• Three backup files preserve both versions.
• resolve clears the conflicted state.
• Small frequent commits and updates reduce clashes.