Skip to content

Instantly share code, notes, and snippets.

@seansu4you87

seansu4you87/svn-merge.md

Last active September 30, 2015 10:37
Show Gist options
  • Save seansu4you87/1771906 to your computer and use it in GitHub Desktop.
Save seansu4you87/1771906 to your computer and use it in GitHub Desktop.
Download ZIP
svn merging
Raw
svn-merge.md

svn merge --accept theirs-full -r0:HEAD ./trunk/ ./testing/

merges trunk -> testing, accepting trunk as canon if conflict arises

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment