Skip to content

Instantly share code, notes, and snippets.

@BenBergman

BenBergman/many_merges_alt.out

Created January 24, 2014 19:32
Show Gist options
  • Save BenBergman/8604370 to your computer and use it in GitHub Desktop.
Save BenBergman/8604370 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
many_merges_alt.out
* Commit P - Merge O into N
|\
| * Commit O after M
| |
* | Commit N - Merge M into L
|\|
| * Commit M after K
Option 1
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─┐ Commit N - Merge M into L
│ ● Commit M after K
Option 2
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─┤ Commit N - Merge M into L
│ ● Commit M after K
Option 3
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─┧ Commit N - Merge M into L
● │ Commit L
│ ● Commit M after K
Option 4
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●┐│ Commit N - Merge M into L
● │ Commit L
│ ● Commit M after K
Option 5
========
●─╮ Commit P - Merge O into N
│ ● Commit O after M
●╮│ Commit N - Merge M into L
●╰┤ Commit L
│ ● Commit M after K
Option 6
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─│─┐ Commit N - Merge M into L
● │ │ Commit L
│ ●─┘ Commit M after K
Option 7
========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─│─┐ Commit N - Merge M into L
● ├─┘ Commit L
│ ● Commit M after K
Option 8
========
●─╮ Commit P - Merge O into N
│ ● Commit O after M
●৲│ Commit N - Merge M into L
● │ Commit L
│ ● Commit M after K
Option 9
========
● Commit P - Merge O into N
┞─● Commit O after M
● Commit N - Merge M into L
┞─ ● Commit M after K
Option 10
=========
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─┧ Commit N - Merge M into L
● │ Commit L
│ ● Commit M after K
@MattWoelk
Copy link 

●⬅⬉ Commit P - Merge O into N
⬆ ● Commit O after M
●⬉⬆ Commit N - Merge M into L
● ⬆ Commit L
⬆ ● Commit M after K

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment