Skip to content

Instantly share code, notes, and snippets.

/gist:6538564

Created September 12, 2013 14:39
Show Gist options
  • Save anonymous/6538564 to your computer and use it in GitHub Desktop.
Save anonymous/6538564 to your computer and use it in GitHub Desktop.
Download ZIP
svn automatic conflict resolution
Raw
gistfile1.txt
svn up --accept=theirs-full
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment