scottmuc / git-workflow

demonstration of what non-overlapping merge bubbles looks like

Git Workflow

This repository is just some scripts that emulate what I think is a good workflow.

Run script init and you'll see something that looks like the following:

~/code/git-workflow ? script/init 
*   3ca1c65 (HEAD, upstream/master, master) Merge branch 'alice'
|\  
| * d9068ca alice adding /tmp/mucflow.kubx/alice/alice.0Ay0p
| * 75c78df alice adding /tmp/mucflow.kubx/alice/alice.0jvg8
| * 5403bab alice adding /tmp/mucflow.kubx/alice/alice.AxP3j
|/  
*   5a179e3 Merge branch 'alice'
|\  
| * 2225df9 alice adding /tmp/mucflow.kubx/alice/alice.MRfGN
| * 5bd6df1 alice adding /tmp/mucflow.kubx/alice/alice.SRjUy
| * de78ea0 alice adding /tmp/mucflow.kubx/alice/alice.1nC93
|/  
*   7323681 Merge branch 'bob'
|\  
| * 18d5f9e bob adding /tmp/mucflow.kubx/bob/bob.O000D
| * 5ea38d5 bob adding /tmp/mucflow.kubx/bob/bob.epQxm
| * 5b424a5 bob adding /tmp/mucflow.kubx/bob/bob.OqNA9
|/  
*   a9faddc Merge branch 'bob'
|\  
| * d28fcf3 bob adding /tmp/mucflow.kubx/bob/bob.cw20t
| * 6908030 bob adding /tmp/mucflow.kubx/bob/bob.7iNMT
| * 738ac6a bob adding /tmp/mucflow.kubx/bob/bob.NokhI
|/  
* eb9aeca initalizing repo