Artifact c522d9a0832d18004bf14f7bbfe9ca23d69a30215856cd433e423eae1fd7aa80:
- File
docs/site/content/docs/reference/cli/repo-merge.md
— part of check-in
[d7fd910ffc]
at
2026-10-23 21:12:43
on branch main
— docs: generate the site's data, CLI reference and llms.txt from the code
tools/docsgen/engine records one check-in as an artifact, as its derived rows and as the cards of a pull, from a real engine run with fixed inputs. tools/docsgen/conformance turns TestCoverage's report into per-draft and per-requirement data. scripts/gen-cli-docs.sh writes one page per command group from the libfossil binary's --help. gen-llms-txt.sh and check-llms-txt.sh are ported from dagnats, and sync-version.sh now takes the highest release tag and writes the go.mod version too.
scripts/check-docs-generated.sh regenerates everything into a scratch dir and fails on any difference; make docs-check and the test-docs CI job run it. (user: [email protected], size: 1127) [annotate] [blame] [check-ins using] [more...]
--- title: 'repo merge' weight: 270 generated: true description: 'Merge a divergent version' --- <!-- Generated by scripts/gen-cli-docs.sh from the libfossil --help output. Do not edit; change the help text in cli/ and run make docs-gen. --> ```text Usage: libfossil repo merge <version> [flags] Merge a divergent version Arguments: <version> Version to merge into current checkout Flags: -h, --help Show context-sensitive help. -R, --repo=STRING Path to repository file -v, --verbose Verbose output --remote=STRING Required-content peer URL (default: saved last-sync-url) --sync-user=STRING Required-content authentication user --sync-pass=STRING Required-content password (never saved) --sync-private Allow recovery of private required artifacts --timeout=10m Required-content deadline; 0 disables it --strategy=STRING Override merge strategy for all files --dry-run Show what would be merged without writing -d, --dir="." Checkout directory ```