@@ -1349,50 +1349,7 @@ Example:
13491349
13501350### Merge strategies
13511351
1352−`%init` - used if it's the first commit to a desk. Also can be used to
1353−"reinitialize" a desk – revision numbers keep going up, but the new
1354−revision isn't necessarily a descendent of the previously numbered
1355−version, allowing merges to be rerun.
1356−
1357−`%this` - keep what's in Bob's desk, but join the ancestry.
1358−
1359−`%that` - take what's in Alice's desk, but join the ancestry. This is
1360−the reverse of `%this`. This is different from `%init` because the new
1361−commit has both sides in its ancestry.
1362−
1363−`%fine` - "fast-forward" merge. This succeeds if and only if one head is in the
1364−ancestry of the other.
1365−
1366−`%meet`, `%mate`, and `%meld` - find the most recent common ancestor to
1367−use as our merge base.
1368−
1369−A `%meet` merge only succeeds if the changes from the merge base to
1370−Alice's head (hereafter, "Alice's changes") are in different files than
1371−Bob's changes. In this case, the parents are both Alice's and Bob's
1372−heads, and the data is the merge base plus Alice's changed files plus
1373−Bob's changed files.
1374−
1375−A `%mate` merge attempts to merge changes to the same file when both
1376−Alice and Bob change it. If the merge is clean, we use it; otherwise, we
1377−fail. A merge between different types of changes – for example,
1378−deleting a file vs changing it – is always a conflict. If we succeed,
1379−the parents are both Alice's and Bob's heads, and the data is the merge
1380−base plus Alice's changed files plus Bob's changed files plus the merged
1381−files.
1382−
1383−A `%meld` merge will succeed even if there are conflicts. If there are
1384−conflicts in a file, then we use the merge base's version of that file,
1385−and we produce a set of files with conflicts. The parents are both
1386−Alice's and Bob's heads, and the data is the merge base plus Alice's
1387−changed files plus Bob's changed files plus the successfully merged
1388−files plus the merge base's version of the conflicting files.
1389−
1390−`%auto` - meta-strategy. Check to see if Bob's desk exists, and if it
1391−doesn't we use an `%init` merge. Otherwise, we progressively try
1392−`%fine`, `%meet`, and `%mate` until one succeeds. If none succeed, we
1393−merge Bob's desk into a scratch desk. Then, we merge Alice's desk into
1394−the scratch desk with the `%meld` option to force the merge. Finally, we
1395−annotate any conflicts, if we know how.
1352+See [@/docs/tutorials/arvo/clay.md#merge-strategies](Clay merge strategies).
13961353
13971354### Manipulation
13981355