Created
February 1, 2012 03:59
-
-
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
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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