Skip to content

Instantly share code, notes, and snippets.

@Ikke
Created June 25, 2012 12:49
Show Gist options
  • Save Ikke/2988389 to your computer and use it in GitHub Desktop.
Save Ikke/2988389 to your computer and use it in GitHub Desktop.
Git test branch workflow
* 662f884 (HEAD, master) Merge branch 'upstream'
|\
| * 546d817 (upstream) Merging feature C
| |\
| * \ ccd36df Merging feature B
| |\ \
| * | | 0b57665 Upstream work
* | | | 657fc39 Merging feature C
|\ \ \ \
| | |_|/
| |/| |
| * | | e096804 (feature/C) Feature C
| |/ /
* | | 897f345 Merging feature B
|\ \ \
| |/ /
|/| /
| |/
| * e5085f5 (feature/B) Add feature B
|/
* 7db78f1 initial commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment