Skip to content

Instantly share code, notes, and snippets.

@rpbaltazar

rpbaltazar/git flows

Created August 27, 2020 13:53
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rpbaltazar/42942d15016a94ea4e925d5a75bae703 to your computer and use it in GitHub Desktop.
Save rpbaltazar/42942d15016a94ea4e925d5a75bae703 to your computer and use it in GitHub Desktop.
Download ZIP
git flows
Raw
git flows
ousama--ooooooooo
|
develop----------------------------->ooooooooo
|
nuno________________________________>xxxx
gco develop
g pull
ousama--ooooooooo
|
develop--------------------------------------->
|
nuno________________________________>xxxx
OPCAO 1
gco nuno
g merge develop
ousama--ooooooooo
|
develop--------------------------------------->
|
nuno________________________________>xxxx--------->
OPCAO 2
gco nuno
g rebase develop
ousama--ooooooooo
|
develop--------------------------------------->
|
nuno________________________________---------->xxxx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment