guyguyon/feature_git_flow.md

Last active December 31, 2016 13:37

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/guyguyon/3923a9ef1fc4475b718885b203fa3959.js"></script>
Save guyguyon/3923a9ef1fc4475b718885b203fa3959 to your computer and use it in GitHub Desktop.

Download ZIP

Feature git flow

Raw

feature_git_flow.md

install oh my zsh

Feature git flow

open branch:

gco -b FOLDER_NAME/FEATURE_NAME creates new branch locally
ggpush creates a remote branch

commit and push my code:

ga . git add
gc -m "my commit message" git commit
ggpush git push to origin

master sync:

gco master back to master
ggpull pull any changes
gco FOLDER_NAME/FEATURE_NAME back to our branch
git merge master merge changes from master
if there are any conflicts:
resole conflicts in editor
ga . add changes
gc -m "merge master into my brnach" commit changes
ggpush push to origin

merge into master:

code review
gco master move back to master
git merge FOLDER_NAME/FEATURE_NAME merge our branch into master
ggpush push changes to origin

other useful commands

git fetch brings all new remote branches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment