Skip to content

Instantly share code, notes, and snippets.

@netdesignr
Forked from hendrauzia/svn_workflow.sh
Created May 9, 2018 11:39
Show Gist options
  • Save netdesignr/6bb9b42ca1b71c4ffb1c90087ac1374c to your computer and use it in GitHub Desktop.
Save netdesignr/6bb9b42ca1b71c4ffb1c90087ac1374c to your computer and use it in GitHub Desktop.
SVN Workflow
# create working directory from trunk
svn checkout http://somedomain.com/repo/trunk
# create a branch
svn copy http://somedomain.com/repo/trunk \
http://somedomain.com/repo//branches/feature-do-awesome-thing \
-m "Created branch to implement feature do awesome thing."
# switch working copy
svn switch ^/repo/branches/feature-do-awesome-thing
# in beanstalk you have to type the whole address, in that case:
svn switch https://[email protected]/repo/branches/feature-do-awesome-thing
# delete a branch
svn rm https://[email protected]/repo/branches/feature-do-awesome-thing \
-m "Removed branch feature-do-awesome-thing for xxx purpose."
# restore deleted branch
svn copy http://somedomain.com/repo/branches/feature-do-awesome-thing@123 \
http://somedomain.com/repo//branches/feature-do-awesome-thing \
-m "Restore deleted branch feature-do-awesome-thing."
# merge a branch
svn merge https://[email protected]/repo/trunk
# resolve conflict
svn resolve --resolve (working|theirs-full|mine-full) path/to/file
# resolve tree conflict
# e.g.: local add, incoming add upon merge
svn resolve --resolve working -R .
@netdesignr
Copy link
Author

Another reference to a quick intro to SVN WP Dev: https://tommcfarlin.com/subversion-for-wordpress-development/

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