Skip to content

Instantly share code, notes, and snippets.

@jessepollak
Last active December 28, 2015 22:49
Show Gist options
  • Save jessepollak/7574211 to your computer and use it in GitHub Desktop.
Save jessepollak/7574211 to your computer and use it in GitHub Desktop.
WordPress plugin on Github
# I do all development off of master and keep a branch "trunk," which has a fully linear history.
# starting on master
git add -p
git commit -m "finishes v1.1"
git push origin master
# we need to keep a linear history in trunk, so
# let's use the first merge --theirs strategy from here
# http://stackoverflow.com/questions/4911794/git-command-for-making-one-branch-like-another/4912267#4912267
git checkout -b tmp
git merge trunk -s ours
git checkout trunk
git merge tmp --squash
git commit -m "updates to v1.1"
git push origin trunk
git branch -D tmp
# now let's sync with our svn repo trunk
git svn dcommit
# now let's tag
svn copy <trunk_url> <tags_url>/1.1 -m "tags 1.1"
# boom!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment