Skip to content

Instantly share code, notes, and snippets.

@Camwyn

Camwyn/OMGGITSVNBBQ.md

Last active May 27, 2022 13:35
Show Gist options
  • Save Camwyn/c4496d9c064d67bd41f2 to your computer and use it in GitHub Desktop.
Save Camwyn/c4496d9c064d67bd41f2 to your computer and use it in GitHub Desktop.
Download ZIP
PUSH to VIP
Raw
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>
@Camwyn
Copy link
Author

Camwyn commented May 28, 2015

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

@Camwyn
Copy link
Author

Camwyn commented Jun 24, 2016 •
edited
Loading

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

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