Created
December 29, 2016 13:09
-
-
Save sheff3rd/644bc6b9696ee5bd45f2e9dba8c9c109 to your computer and use it in GitHub Desktop.
Git up to date
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 branch | |
| - git commit | |
| - git checkout master | |
| - git pull | |
| - git checkout branch | |
| - git rebase origin/master | |
| if there are no conflicts: | |
| - git push branch --force | |
| if there are conflicts: | |
| - resolve conflicts | |
| - move changes to staged changes (git gui NOT COMMIT) | |
| - git rebase --continue | |
| - git push branch --force |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment