Last active
April 11, 2017 18:50
-
-
Save hattmarris/d68d2d630aeb91f5e417a72115cfe826 to your computer and use it in GitHub Desktop.
Git hotfix
This file contains hidden or 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 master | |
git checkout -b hotfix # branch off master, make changes here | |
# PR could be submitted at this point for merge to master (production) | |
git checkout master | |
git merge hotfix # merge the fix into master | |
# Could deploy immediately | |
git checkout develop | |
git merge hotfix # merge the fix into develop, Will have same commit SHA(s) as fix deployed to master (as opposed to cherry pick / new commit) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment