Skip to content

Instantly share code, notes, and snippets.

@nathaniel-miller

nathaniel-miller/git-flow

Last active January 16, 2016 05:38
Show Gist options
  • Save nathaniel-miller/7a12d5a4973e4342499c to your computer and use it in GitHub Desktop.
Save nathaniel-miller/7a12d5a4973e4342499c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-flow
MASTER
|
|__________ADD-TURTLE #from master, create branch add-turtle
| |
| x #add turtle pic and caption to index.html
| |
|_______________x #merge add-turtle into master.
|
|__________ADD-WALRUS #from master, create branch add-walrus
| |
| x #add walrus pic and caption
| |
|_______________|_________ADD-W&P #from master, create branch add-walrus-and-polar-bear
| | |
| | x #add polar bear pic and caption
| | |
| |_______________x #merge add-walrus into add-w&p-bear, fix merge conflicts
| |
|__________ADD-FF | #"Lauren" branches of master with add-ff. adds emoticon to readme
| | |
| x | #add firefly pic and caption to add-firefly branch
| | |
|_______________x | #merge add-firefly into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment