File tree Expand file tree Collapse file tree 2 files changed +12
-0
lines changed Expand file tree Collapse file tree 2 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -1786,6 +1786,8 @@ scratch/topic2> add
17861786scratch/main> switch /main
17871787```
17881788
1789+ Case 1: Merging child ` /topic ` into parent ` /main ` uses parent ` /main ` 's GUID
1790+
17891791``` ucm :error
17901792scratch/main> merge /topic
17911793```
@@ -1805,6 +1807,8 @@ scratch/topic> names Foo
18051807scratch/merge-topic-into-main> names Foo
18061808```
18071809
1810+ Case 2: Merging parent ` /main ` into child ` /topic ` also uses parent ` /main ` 's GUID
1811+
18081812``` ucm :error
18091813scratch/topic> merge /main
18101814```
@@ -1824,6 +1828,8 @@ scratch/topic> names Foo
18241828scratch/merge-main-into-topic> names Foo
18251829```
18261830
1831+ Case 3: Merging ` /topic ` into ` /topic2 ` (neither of which is a parent of the other) uses a new third GUID
1832+
18271833``` ucm :error
18281834scratch/topic> merge /topic2
18291835```
Original file line number Diff line number Diff line change @@ -3550,6 +3550,8 @@ scratch/topic2> add
35503550scratch/main> switch /main
35513551```
35523552
3553+ Case 1: Merging child ` /topic ` into parent ` /main ` uses parent ` /main ` 's GUID
3554+
35533555``` ucm :error
35543556scratch/main> merge /topic
35553557
@@ -3638,6 +3640,8 @@ scratch/merge-topic-into-main> names Foo
36383640 #j2e5n5ucie Type Foo
36393641```
36403642
3643+ Case 2: Merging parent ` /main ` into child ` /topic ` also uses parent ` /main ` 's GUID
3644+
36413645``` ucm :error
36423646scratch/topic> merge /main
36433647
@@ -3725,6 +3729,8 @@ scratch/merge-main-into-topic> names Foo
37253729 #j2e5n5ucie Type Foo
37263730```
37273731
3732+ Case 3: Merging ` /topic ` into ` /topic2 ` (neither of which is a parent of the other) uses a new third GUID
3733+
37283734``` ucm :error
37293735scratch/topic> merge /topic2
37303736
You can’t perform that action at this time.
0 commit comments