-
Notifications
You must be signed in to change notification settings - Fork 6
Git Workflow
jbouzi12 edited this page Nov 27, 2014
·
4 revisions
-
git checkout -b my_feature
-
Write code, commit features to your branch. When done...
-
git checkout master
-
git pull
-
git checkout my_feature
-
git rebase master
-
git push origin my_feature
-
git checkout master
-
git pull
-
If no changes, create pull request.
-
If Corey tells you that your changes can't be merged automatically b/c the code has changed since the time you created the request: a. git checkout master b. git pull c. git rebase master d. Fix merge conflicts e. git push origin your_branch -f (This is a force push.) You do not have to do anything to your original pull request.