PUSH to VIP

OMGGITSVNBBQ.md

#GIT/SVN to VIP (OMG GITSVN BBQ!)

Created and maintained to ease pushing a git repo to VIP (svn)

Notes: <branch name> is the name of your feature/fix/whatever branch so if you’re merging a branch named fix/hot-sauce then substitute “fix/hot-sauce" wherever you see <branch name>

###MERGE:

• git checkout master
• git pull
• git merge --no-ff <branch name>

###SVN PUSH:

• svn commit -m “Description of new features”
• git push origin master

###ARCHIVE BRANCH:

• git checkout <branch name>
• git tag archive/<branch name> (yes, this would be "archive/fix/hot_sauce")
• git push origin archive/<branch name> (this pushes the tag to the repo so others can use it)
• git checkout master
• git branch -D <branch name>
• git push origin —delete <branch name>

If while you are doing this you lose track of what all the svn status codes mean: http://gotofritz.net/blog/howto/svn-status-codes/

I wrote git aliases for these, they're in my aliases at https://gist.github.com/Camwyn/b2671739a82275d8375c

Note for folks randomly arriving here, the archived branches are still available by doing:
git checkout archive/<branch name>
and then
git checkout -b <branch name> to recreate the branch