-
-
Save bradenpowers/b3d71e2076cd09601ad2a69314e17b88 to your computer and use it in GitHub Desktop.
Git overwrite branch with another branch
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
# overwrite master with contents of feature branch (feature > master) | |
git checkout feature # source name | |
git merge -s ours master # target name | |
git checkout master # target name | |
git merge feature # source name |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment