Skip to content

Instantly share code, notes, and snippets.

@kyleturner
Created February 1, 2012 03:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kyleturner/1715005 to your computer and use it in GitHub Desktop.
Save kyleturner/1715005 to your computer and use it in GitHub Desktop.
Override the default master branch, and take our "new" master branch as new default
git checkout seotweaks
git merge -s ours master
git checkout master
git merge seotweaks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment