Graphviz Dot, mix directed and undirected
digraph { A; B; C subgraph Rel1 { edge [dir=none, color=red] A -> B -> C -> A } subgraph Rel2 { edge [color=blue] B -> C C -> A } }
digraph { A; B; C subgraph Rel1 { edge [dir=none, color=red] A -> B -> C -> A } subgraph Rel2 { edge [color=blue] B -> C C -> A } }
The answer is yes for default merges. A three-way merge finds a common ancestor and then applies the differences from both sides, an operation that isn’t order dependent. The topic of merge-ordering and commutativity generated a fascinating discussion on the git list (if you’re into that kind of thing, that is). Note B into C … Read more