| Merge |
| ----- |
| |
| [graphviz] |
| ---- |
| digraph { |
| node [style=bold, shape=circle, color="#385d8a", fontname=arial, fontsize=18] |
| edge [style=bold, color="#385d8a", arrowhead=none] |
| G [style=filled, fillcolor=coral1, color=red] |
| |
| G -> D [color=red] |
| D -> C -> B -> A |
| G -> F [weight=0, color=red] |
| F -> E |
| E -> B [weight=0] |
| |
| edge [arrowhead=normal] |
| node [shape=box, style=filled, fillcolor=lightgrey, color=black] |
| HEAD [fillcolor="#555555", fontcolor=white] |
| master [color=red, fontcolor=red] |
| |
| HEAD -> master |
| master -> G [color=red] |
| F -> feature1 [dir=back] |
| |
| { rank=same; G; HEAD; master } |
| { rank=same; D; F; feature1 } |
| { rank=same; C; E } |
| |
| master_old [style=dashed, label=master, color=grey, fontcolor=grey] |
| master_old -> D [style=dashed, color=grey] |
| |
| { rank=same; master_old; D } |
| |
| C -> E [style=invis] |
| D -> F [style=invis] |
| } |
| ---- |
| |
| 'Merge Commit' = commit with more than one parent |
| |
| [role="incremental"] |
| * 'Q:' which commits belong to the history of branch `master`? |
| * 'Q:' which commits belong to the history of branch `feature1`? |
| * 'Q:' what if we merged in the opposite direction: `master` into `feature1`? |
