ErrorHelp.com - Solution for [After resolving a conflict in a file the svn commit fails svn Aborting commit settings py]

After resolving a conflict in a file, the svn commit fails:

svn: Aborting commit: 'settings.py' remains in conflict

This works!

+0 Vote Up

Vote Down +0 Vote Up

The fix is to resolve the conflict like this:

$ svn resolved settings.py
Resolved conflicted state of 'settings.py'

user9163

Apr 12, 2008

Report Abuse