git.iko.soy/urbit.org
on master help sign in
add strategies header
6f9d8bbdrbeefsupreme
arvo/clay/using.md+2
compare with master
unifiedsplit
@@ -92,6 +92,8 @@ with the source and destination commits as parents.
92Several strategies need a "merge-base". They find it by identifying
92Several strategies need a "merge-base". They find it by identifying
93the most recent common ancestor of the two desks. If none, fail
93the most recent common ancestor of the two desks. If none, fail
94with `%merge-no-merge-base`; if there are two or more, pick one.
94with `%merge-no-merge-base`; if there are two or more, pick one.
95+
96+#### Strategies
95
97
96**`%init`**: the only way to create a desk. Not a true merge, since it
98**`%init`**: the only way to create a desk. Not a true merge, since it
97simply assigns the source commit to the destination.
99simply assigns the source commit to the destination.