equal
deleted
inserted
replaced
684 base: [4] fix bug 24 (v1) |
684 base: [4] fix bug 24 (v1) |
685 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
685 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
686 |
686 |
687 Figure 10 shows how Bob's repository looks now. |
687 Figure 10 shows how Bob's repository looks now. |
688 |
688 |
689 [figure SG10: only one visible head, 7:aa82, successor to hidden 5:541f and 6:e3a5] |
689 .. figure:: figures/figure-sg10.svg |
|
690 |
|
691 Figure 10: only one visible head, 7:aa82, successor to hidden 5:541f and |
|
692 6:e3a5 |
690 |
693 |
691 We carefully dodged a merge conflict by specifying a merge tool |
694 We carefully dodged a merge conflict by specifying a merge tool |
692 (``internal:other``) that will take Alice's changes over Bob's. (You |
695 (``internal:other``) that will take Alice's changes over Bob's. (You |
693 might wonder why Bob wouldn't prefer his own changes by using |
696 might wonder why Bob wouldn't prefer his own changes by using |
694 ``internal:local``. He's avoiding a `bug`_ in ``evolve`` that occurs |
697 ``internal:local``. He's avoiding a `bug`_ in ``evolve`` that occurs |