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
+1
-1
@@ -1922,7 +1922,7 @@ Fetch `<remote>/<branch>` and bring the local branch up to date with it.
|
||||
|
||||
- Fetches `<remote>/<branch>`, then: fast-forwards when only the remote moved; rebases the local commits on top when both sides moved but touched disjoint files; exits 42 (rebase-review gate) when both sides touched the same file.
|
||||
- Files `wikitool` generates (`kb/index.md`, `kb/log.md`, `kb/provenance.md`, every `kb/**/INDEX.md`) never count as an overlap and never reach the gate. Where they are what stops git - uncommitted ones in the way of a fast-forward or rebase, or a rebase conflict in them - they are merged mechanically: `kb/log.md` becomes the incoming log 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 carried through it (`git rebase --autostash`) and come back unchanged.
|
||||
- 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 restores the working tree and names the ref.
|
||||
- A refused call performs no rebase attempt and leaves the branch where it was.
|
||||
- The `--confirm-rebase` token covers the exact upstream state and the set of files touched on both sides, generated files excluded; either one moving makes it stale.
|
||||
|
||||
@@ -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