From Phormix Wiki
Jump to: navigation, search

Dealing with conflicts between your local SVN and head

How to force local changes to override head and push through

Force SVN to accept a file deletion

svn remove --force path/to/filename
svn resolve --accept=working path/to/filename
svn commit

Forcing local repository as current

This can be used to force the local repository to think that it's current without pulling down changes in the head

svn up --accept mine-full