docs: sync record states the autostash behaviour, not the change (#180)
Files changed: - CHANGES.md - VERSION - tools/CONTRACT.md - tools/chemenu/commands/git_publish.py Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SnAJ7Z3CpVD3PRbN73QtU2
This commit is contained in:
1 parent
d4638bacde
commit
fa106eeda3
4 files changed
+11
-4
No files matched your search
@@ -1349,7 +1349,7 @@ def apply_reconcile(outcome: ReconcileOutcome, remote: str, branch: str, command
|
||||
"plus the entries only this side appended, and the catalog and `kb/provenance.md` are "
|
||||
"regenerated from the merged pages and left as an uncommitted change. A reconcile git "
|
||||
"can do on its own is unchanged and regenerates nothing.",
|
||||
"Uncommitted changes that no incoming commit touches no longer stop a rebase: they are "
|
||||
"Uncommitted changes that no incoming commit touches do not stop a rebase: they are "
|
||||
"carried through it (`git rebase --autostash`) and come back unchanged.",
|
||||
"Before anything is set aside, the working tree is stored as a commit under "
|
||||
"`refs/wikitool/reconcile-backup`. A successful reconcile drops it; a failed one "
|
||||
|
||||
Reference in new issue
Block a user