<?xml version="1.0" encoding="utf-8"?>
<entry xmlns="http://www.w3.org/2005/Atom" xml:base="https://docs.spec-kitty.ai/guides/how-to/recovery/troubleshoot-merge/">
  <id>https://docs.spec-kitty.ai/guides/how-to/recovery/troubleshoot-merge/</id>
  <title>How to Troubleshoot Merge Issues</title>
  <updated>2026-11-06T00:00:00.000Z</updated>
  <author><name>Spec Kitty</name></author>
  <link rel="alternate" type="text/html" href="https://docs.spec-kitty.ai/guides/how-to/recovery/troubleshoot-merge/"/>
  <summary>How to troubleshoot spec-kitty consolidate: resume or abort a stopped run and fix the refusals operators meet most, each with its command.</summary>
  <content type="html">&lt;span id=&quot;how-to-troubleshoot-merge-issues&quot;&gt;&lt;/span&gt;
&lt;p&gt;Use this guide when &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; stopped, refused to start, or was interrupted.&lt;/p&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; lands a Mission’s lane branches on its mission branch, then lands the mission branch on the &lt;strong&gt;local&lt;/strong&gt; target branch. It never publishes to origin unless you pass &lt;code dir=&quot;auto&quot;&gt;--push&lt;/code&gt;.&lt;/p&gt;
&lt;p&gt;Each section gives what you see, what it means, and the command to run. The full list of exit codes and refusal codes is in the &lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate-exit-codes-and-refusal-codes&quot;&gt;CLI reference&lt;/a&gt;; this guide covers the cases you are likely to meet.&lt;/p&gt;
&lt;h2 id=&quot;quick-reference&quot;&gt;Quick Reference&lt;/h2&gt;

































&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;What happened&lt;/th&gt;&lt;th&gt;Run&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;The run was interrupted (terminal closed, process killed, a lane failed to merge)&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; (a run that failed and rolled back completely: &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt;, see &lt;a href=&quot;#a-failed-run-that-rolled-back-completely-drops-its-baseline&quot;&gt;below&lt;/a&gt;)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;You want to undo what the run moved and start over&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;You want to check readiness without changing anything&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --dry-run&lt;/code&gt; (it refuses like the real run when the mission branch is missing)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;UNEXPLAINED_BRANCH_MOVE&lt;/code&gt; on a re-run or &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Inspect the branch, see &lt;a href=&quot;#a-branch-moved-without-a-record&quot;&gt;A branch moved without a record&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; keeps reporting a branch &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort --release-branch &amp;#x3C;branch&gt; --release-reason &quot;&amp;#x3C;why&gt;&quot;&lt;/code&gt;, see &lt;a href=&quot;#keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Exit code 75, &lt;code dir=&quot;auto&quot;&gt;COORD_MOVED_AFTER_LANDING&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;, see &lt;a href=&quot;#exit-code-75-the-landing-stands&quot;&gt;Exit code 75&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;
&lt;p&gt;A clean &lt;code dir=&quot;auto&quot;&gt;--dry-run&lt;/code&gt; does not prove the real run will land. The dry run refuses with the real run’s “Missing mission branch” refusal when the mission branch does not exist (#7267). Under the default squash strategy it also previews only what is already merged into the mission branch, so it can refuse a landing the real run makes (#7268). It does not run the real run’s canceled-content checks, so it can also pass a landing the real run refuses (#7296).&lt;/p&gt;
&lt;h2 id=&quot;resume-an-interrupted-consolidation&quot;&gt;Resume an Interrupted Consolidation&lt;/h2&gt;
&lt;p&gt;Run the command from the repository root checkout:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--resume&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Add &lt;code dir=&quot;auto&quot;&gt;--mission &amp;#x3C;slug&gt;&lt;/code&gt; to name the Mission. Resume reads the record in &lt;code dir=&quot;auto&quot;&gt;.kittify/runtime/merge/&amp;#x3C;mission_id&gt;/state.json&lt;/code&gt; and continues from the progress it holds.&lt;/p&gt;
&lt;p&gt;Running &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt; on a Mission with an unfinished record has the same effect: it prints &lt;code dir=&quot;auto&quot;&gt;Detected interrupted merge&lt;/code&gt; and resumes.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Strategy.&lt;/strong&gt; A resume keeps the strategy of the interrupted run. Passing a different &lt;code dir=&quot;auto&quot;&gt;--strategy&lt;/code&gt; is refused. Resume without &lt;code dir=&quot;auto&quot;&gt;--strategy&lt;/code&gt;, or run &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; and start again.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;No record.&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;No interrupted merge to resume.&lt;/code&gt; means there is nothing to continue. Start a fresh run with &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Worktree that shows staged deletions.&lt;/strong&gt; Do not commit them. See &lt;a href=&quot;/guides/how-to/recovery/recover-from-interrupted-merge/#a-worktree-that-shows-staged-deletions-after-an-interruption&quot;&gt;Recover from an Interrupted Consolidation&lt;/a&gt;.&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;undo-a-run-with-abort&quot;&gt;Undo a Run with —abort&lt;/h2&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--abort&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; restores the branches the run moved (the target branch, the mission branch and the coordination branch) to the commits they had before the run. It restores a branch only while that branch is still at the commit this run recorded, or at a commit the run saved as its next move before it was interrupted. It never overwrites a commit that someone else added, and it never treats a commit it cannot explain as already restored.&lt;/p&gt;
&lt;p&gt;The command prints a rollback report with one line per branch. A branch is restored, already at its snapshot (&lt;code dir=&quot;auto&quot;&gt;unchanged&lt;/code&gt;), kept by an operator release (&lt;code dir=&quot;auto&quot;&gt;kept&lt;/code&gt;), or marked &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; with the reason. A restore marked &lt;code dir=&quot;auto&quot;&gt;adopted interrupted advance&lt;/code&gt; undid a move the interrupted run had saved before making it.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Everything restored.&lt;/strong&gt; The command exits 0 and clears the record.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A branch could not be restored.&lt;/strong&gt; The command exits 1 and keeps the record. Running &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; again gives the same answer until you decide what happens to that branch; see &lt;a href=&quot;#keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/a&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;The landing was already verified.&lt;/strong&gt; The command prints &lt;code dir=&quot;auto&quot;&gt;Kept the landing verified by an earlier reconciliation&lt;/code&gt;, rolls nothing back, exits 1 and keeps the record. Finish with &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; instead.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Lane branches are never moved. For a Mission with a coordination topology, &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; also removes the coordination worktree unless the Mission’s &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt; retains worktrees.&lt;/p&gt;
&lt;p&gt;For the full description, see &lt;a href=&quot;/guides/how-to/recovery/recover-from-interrupted-merge/#aborting-a-consolidation&quot;&gt;Recover from an Interrupted Consolidation&lt;/a&gt;.&lt;/p&gt;
&lt;h3 id=&quot;keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/h3&gt;
&lt;p&gt;A branch is &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; when it holds a commit this run did not record: a commit someone else added on top of the landing, or a move the interrupted run made without saving it. &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; will not move such a branch. When you want to keep its current commits, release it:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;log&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;restore-target&gt;..&amp;#x3C;branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--abort&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--release-branch&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;branch&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--release-reason&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#984E4D&quot;&gt;&amp;#x3C;why you keep it&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Take &lt;code dir=&quot;auto&quot;&gt;&amp;#x3C;restore-target&gt;&lt;/code&gt; from the report or the refusal. The released branch is left at its current commit and reported:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;kept       &amp;#x3C;branch&gt;  (released by operator: &amp;#x3C;why you keep it&gt;; at &amp;#x3C;sha&gt;; may contain this consolidation&apos;s unverified changes)&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Review those changes afterwards: the kept commits can include what this consolidation landed without verifying it. A kept commit cannot ship a mission without its approved code: when the kept branch drops a work package’s approved change (for example a commit of a lagging checkout’s staged deletions), the next consolidation refuses with &lt;code dir=&quot;auto&quot;&gt;APPROVED_CONTENT_MISSING&lt;/code&gt; naming that work package. A kept mission branch that already carries a lane is also refused by the next consolidation, even with the lane’s code intact, under either strategy (squash: its files read as belonging to no approved work package; merge: its commits do), so prefer &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; without a release when the branch can be restored. Every other branch is restored as usual. When nothing else is left unrestored, the command exits 0, clears the record, and its closing line names the kept branch instead of saying all branches were restored.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Repeatable.&lt;/strong&gt; Pass &lt;code dir=&quot;auto&quot;&gt;--release-branch&lt;/code&gt; once per branch. &lt;code dir=&quot;auto&quot;&gt;--release-reason&lt;/code&gt; is required and applies to all of them.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Only the record’s own branches.&lt;/strong&gt; You can release the target branch, the mission branch or the coordination branch, never a lane branch.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Never a restorable branch.&lt;/strong&gt; If the branch can in fact be restored, &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; restores it and the release has no effect.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Bound to the commit.&lt;/strong&gt; The release is saved for the commit the branch is at when you run the command. If the branch moves afterwards, the release no longer applies and the branch is reported &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; again.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A release survives a failed abort.&lt;/strong&gt; If the same &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; cannot restore another branch, the release stays in the record. A later plain &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt; still keeps the released branch while it sits at that commit, and reports it as &lt;code dir=&quot;auto&quot;&gt;kept&lt;/code&gt;.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;If you do not want to keep the commits, move the branch yourself after reviewing them; spec-kitty never moves a commit it cannot prove is its own.&lt;/p&gt;
&lt;p&gt;Misuse is refused before anything changes, with exit code 2 and &lt;code dir=&quot;auto&quot;&gt;Error code: RELEASE_BRANCH_INVALID.&lt;/code&gt;: &lt;code dir=&quot;auto&quot;&gt;--release-branch&lt;/code&gt; without &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt;, without &lt;code dir=&quot;auto&quot;&gt;--release-reason&lt;/code&gt;, naming a lane branch or a branch the record does not know, or naming a branch that does not resolve to a commit.&lt;/p&gt;
&lt;h2 id=&quot;the-run-refused-before-moving-anything&quot;&gt;The Run Refused Before Moving Anything&lt;/h2&gt;
&lt;p&gt;These refusals stop the run before any branch moves. Fix the cause, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; again.&lt;/p&gt;
&lt;h3 id=&quot;wrong-branch-or-uncommitted-changes&quot;&gt;Wrong branch or uncommitted changes&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Refusing destructive operation (MERGE_UNSAFE_PRIMARY_OFF_TARGET).&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;The repository root checkout is not on the branch &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; expects. The refusal names the branch. Check it out in the repository root checkout:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;checkout&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;target-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Refusing destructive operation (MERGE_UNSAFE_PRIMARY_DIRTY).&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Refusing destructive operation (MERGE_UNSAFE_WORKTREE_DIRTY).&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;The first code names the repository root checkout. The second names a lane worktree or the coordination worktree. The refusal lists the worktree and its dirty entries. Commit, stash or revert the changes in that worktree, then resume.&lt;/p&gt;
&lt;p&gt;A lane worktree is checked only when the run is going to remove it. With &lt;code dir=&quot;auto&quot;&gt;--keep-worktree&lt;/code&gt;, a dirty lane worktree does not stop the run.&lt;/p&gt;
&lt;h3 id=&quot;target-branch-content-conflicts-during-squash&quot;&gt;Target-Branch Content Conflicts During Squash&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Default squash integration would conflict with newer target-branch content.&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;diagnostic_code: TARGET_BRANCH_CONTENT_CONFLICT&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;mission_branch: &amp;#x3C;mission-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;target_branch: &amp;#x3C;target-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;conflicting_path: &amp;#x3C;path&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;The mission branch and a newer target-branch commit changed the same content. Spec Kitty does not pick a side. &lt;code dir=&quot;auto&quot;&gt;--dry-run&lt;/code&gt; reports the same code before anything moves, and it checks the mission branch as it stands now.&lt;/p&gt;
&lt;p&gt;The remedy is to update the mission branch against the current target branch, resolve the listed paths, then rerun. Do the update in a separate worktree. &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; refuses to run when the repository root checkout is off the target branch, so a checkout of the mission branch there would block the rerun.&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;worktree&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;add&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;path&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;mission-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;-C&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;path&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;merge&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;target-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#919F9F;--1:#5F636F&quot;&gt;# Resolve each conflicting_path, stage it, then commit.&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;-C&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;path&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;add&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;src/path/to/file.py&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;-C&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;path&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;commit&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;worktree&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;remove&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;path&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--dry-run&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;h3 id=&quot;origin-is-ahead-of-this-clone-origin_-codes&quot;&gt;Origin is ahead of this clone (&lt;code dir=&quot;auto&quot;&gt;ORIGIN_*&lt;/code&gt; codes)&lt;/h3&gt;
&lt;p&gt;Before anything moves, &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; (and &lt;code dir=&quot;auto&quot;&gt;accept&lt;/code&gt;) asks the remote that owns each branch it is about to trust, so a teammate’s pushed rejection cannot land as done. A refusal prints the code, the branch and the command to run; nothing was moved. Re-run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; after the fix. A repository with no remote, or a branch that was never pushed, is not checked.&lt;/p&gt;








































&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Code&lt;/th&gt;&lt;th&gt;What it means&lt;/th&gt;&lt;th&gt;Fix&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_STATUS_STALE&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Origin has status events for this Mission that your clone lacks.&lt;/td&gt;&lt;td&gt;Run the printed &lt;code dir=&quot;auto&quot;&gt;git pull&lt;/code&gt; in the checkout that holds the branch (or &lt;code dir=&quot;auto&quot;&gt;git fetch &amp;#x3C;remote&gt; &amp;#x3C;branch&gt;:&amp;#x3C;branch&gt;&lt;/code&gt;). With a consolidation record present, run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt; first, as the message says.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_LANE_STALE&lt;/code&gt;&lt;/td&gt;&lt;td&gt;An approved lane branch is behind origin, diverged from it, or missing here.&lt;/td&gt;&lt;td&gt;Behind: &lt;code dir=&quot;auto&quot;&gt;git fetch &amp;#x3C;remote&gt; &amp;#x3C;lane&gt;&lt;/code&gt; then &lt;code dir=&quot;auto&quot;&gt;git -C &amp;#x3C;lane worktree&gt; merge --ff-only &amp;#x3C;remote&gt;/&amp;#x3C;lane&gt;&lt;/code&gt;. Missing: &lt;code dir=&quot;auto&quot;&gt;git branch &amp;#x3C;lane&gt; &amp;#x3C;remote&gt;/&amp;#x3C;lane&gt;&lt;/code&gt;. Diverged: merge origin’s lane in or rebase onto it, then push. Do not &lt;code dir=&quot;auto&quot;&gt;git branch -f&lt;/code&gt; a diverged lane.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_UNREACHABLE&lt;/code&gt;&lt;/td&gt;&lt;td&gt;The remote did not answer. The text says whether it timed out (maybe only slow: retry) or failed.&lt;/td&gt;&lt;td&gt;Retry, or check network access and credentials.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_REMOTE_AMBIGUOUS&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Several remotes exist and none owns the branch.&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;git config branch.&amp;#x3C;name&gt;.remote &amp;#x3C;remote&gt;&lt;/code&gt;.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_COMPARE_FAILED&lt;/code&gt;&lt;/td&gt;&lt;td&gt;The remote answered but git could not compare the branch with it (shallow clone or damaged ref).&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;git fetch --unshallow &amp;#x3C;remote&gt;&lt;/code&gt;, or repair the ref.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;ORIGIN_LANE_DIVERGED&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty agent action review&lt;/code&gt; only: the reviewed lane diverged from origin.&lt;/td&gt;&lt;td&gt;Merge origin’s lane in, or merge or rebase yours onto &lt;code dir=&quot;auto&quot;&gt;&amp;#x3C;remote&gt;/&amp;#x3C;lane&gt;&lt;/code&gt; and push.&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;
&lt;p&gt;To go on anyway, &lt;code dir=&quot;auto&quot;&gt;--origin-check warn&lt;/code&gt; (or &lt;code dir=&quot;auto&quot;&gt;SPEC_KITTY_ORIGIN_CHECK=warn&lt;/code&gt;) prints each finding as a warning and continues. &lt;code dir=&quot;auto&quot;&gt;--origin-check off&lt;/code&gt; (or &lt;code dir=&quot;auto&quot;&gt;SPEC_KITTY_ORIGIN_CHECK=off&lt;/code&gt;) contacts nothing and accepts stale evidence: use it only when you cannot reach the remote and accept that a rejection your teammate pushed can land as done. &lt;code dir=&quot;auto&quot;&gt;agent action review&lt;/code&gt; has no flag and honors only the variable; &lt;code dir=&quot;auto&quot;&gt;ORIGIN_LANE_DIVERGED&lt;/code&gt; is lifted only by &lt;code dir=&quot;auto&quot;&gt;SPEC_KITTY_ORIGIN_CHECK=warn&lt;/code&gt;, never by a flag. Any other value of the variable enforces and prints a warning.&lt;/p&gt;
&lt;h3 id=&quot;not-synchronized-with-origin-only-with-push&quot;&gt;Not synchronized with origin (only with —push)&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;diagnostic_code: TARGET_BRANCH_NOT_SYNCHRONIZED&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;This check runs only when &lt;code dir=&quot;auto&quot;&gt;--push&lt;/code&gt; is in effect. A plain &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; does not need the target branch to match origin for push safety. (It does ask origin about the Mission’s own status log and approved lanes: see &lt;a href=&quot;#origin-is-ahead-of-this-clone-origin_-codes&quot;&gt;Origin is ahead&lt;/a&gt;.) The code means the local target branch is ahead of, behind or diverged from its tracking branch.&lt;/p&gt;
&lt;p&gt;Do not push the local target branch to satisfy the check; its extra commits may belong to other Missions. Choose one:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Run without &lt;code dir=&quot;auto&quot;&gt;--push&lt;/code&gt;.&lt;/strong&gt; Land locally, then publish through a topic branch and a pull request.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Use the focused pull request path the refusal prints.&lt;/strong&gt; It creates a branch from the mission branch, pushes that branch, and opens the pull request into the target branch.&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;the-run-stopped-after-moving-branches&quot;&gt;The Run Stopped After Moving Branches&lt;/h2&gt;
&lt;h3 id=&quot;a-lane-failed-to-merge&quot;&gt;A lane failed to merge&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;✗ &amp;#x3C;lane&gt;: &amp;#x3C;error&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;A lane could not be merged into the mission branch. The run exits 1 and rolls back the branches it moved. Fix the lane branch, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;. If &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; answers &lt;code dir=&quot;auto&quot;&gt;No interrupted merge to resume.&lt;/code&gt;, the run left no record; run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt; instead. To drop the run, use &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt;.&lt;/p&gt;
&lt;h3 id=&quot;reconciliation-failed-or-refused&quot;&gt;Reconciliation FAILED or refused&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Reconciliation FAILED: &amp;#x3C;divergence&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Reconciliation refused (fail-closed): &amp;#x3C;reason&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;After landing, &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; checks that the target holds exactly the approved work. When the check fails or cannot decide, the run restores the branches it moved and prints the rollback report that starts &lt;code dir=&quot;auto&quot;&gt;Rollback to the pre-consolidation snapshot:&lt;/code&gt;. If someone else committed on the target after the landing, that commit is kept: the target is reported &lt;code dir=&quot;auto&quot;&gt;NOT restored ... moved by another actor&lt;/code&gt;, and the record stays open (see &lt;a href=&quot;#keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/a&gt;).&lt;/p&gt;
&lt;p&gt;Read the divergence or reason. It names the WP, the lane and the paths. Correct the lane, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; again. If the rollback restored every branch, the run re-baselined its record, so the re-run starts from the target’s current tip (see &lt;a href=&quot;#a-failed-run-that-rolled-back-completely-drops-its-baseline&quot;&gt;A failed run that rolled back completely drops its baseline&lt;/a&gt;). A run that left a branch &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; keeps its record: resolve the branch, then &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; or &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt;.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;A FAIL cannot be overridden.&lt;/strong&gt; Correct the content on the lane through a surviving WP.&lt;/p&gt;
&lt;/li&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;Missing or contradictory attribution about a canceled WP&lt;/strong&gt; can be attested after you check by hand that the canceled content is absent or superseded:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--attest-canceled-superseded&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP03&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--attest-reason&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#984E4D&quot;&gt;&amp;#x3C;what you checked&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;The flag is repeatable, one WP per use, and &lt;code dir=&quot;auto&quot;&gt;--attest-reason&lt;/code&gt; is required. It never lifts a FAIL. A &lt;code dir=&quot;auto&quot;&gt;--dry-run&lt;/code&gt; does not apply it.&lt;/p&gt;
&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;a-failed-run-that-rolled-back-completely-drops-its-baseline&quot;&gt;A failed run that rolled back completely drops its baseline&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Rollback to the pre-consolidation snapshot:&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;restored   &amp;#x3C;target&gt;      &amp;#x3C;post&gt; -&gt; &amp;#x3C;pre&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;restored   &amp;#x3C;mission&gt;     &amp;#x3C;post&gt; -&gt; &amp;#x3C;pre&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;unchanged  &amp;#x3C;lane&gt;        (already at &amp;#x3C;sha&gt;)&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Rebaselined the consolidation record: nothing of this attempt remains, so the next run reads &amp;#x3C;target&gt;&apos;s current tip as its pre-mutation baseline instead of this attempt&apos;s. `spec-kitty consolidate --abort` clears the record.&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Every branch the run moved is back at its pre-run commit, so nothing of that attempt is on the target. The run then drops the transaction geometry that attempt anchored — its target baseline, its pre-mutation snapshot, its restore targets and its per-attempt progress — and says so.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;What it means.&lt;/strong&gt; The next run re-derives its reconciliation baseline from the target’s &lt;strong&gt;current&lt;/strong&gt; tip. Anything committed on the target since the failed attempt — your own fix for the cause, a teammate’s commit, another Mission’s status commit — is already landed content, not Mission content, so it is neither reported un-attributable nor rolled back over.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;What to run.&lt;/strong&gt; Fix the cause, then &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt;. &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; also works; it re-derives the target baseline from the live tip (a coordination Mission keeps its coordination anchor).&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;&lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt;.&lt;/strong&gt; With nothing left to restore, &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; prints &lt;code dir=&quot;auto&quot;&gt;Aborted ... state and workspace cleaned up&lt;/code&gt;, clears what remains of the record and exits 0. It does not refuse; on a coordination Mission it can also tear down the coordination worktree and marker (the coordination branch is kept), and it holds the consolidation lock for that.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;The boundary.&lt;/strong&gt; A rollback that leaves a branch &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; keeps the attempt’s baseline and snapshot untouched, because that content is still on the target: resolve the branch, then &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; — or &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; once the branch is back at a tip the record can explain. When the kept content is yours to keep, release it as described in &lt;a href=&quot;#keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/a&gt;.&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;an-un-attributable-verdict-after-merging-a-dependency-branch&quot;&gt;An &lt;code dir=&quot;auto&quot;&gt;un-attributable&lt;/code&gt; verdict after merging a dependency branch&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Reconciliation FAILED: ... un-attributable ...&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;A lane that merged an external dependency branch (&lt;code dir=&quot;auto&quot;&gt;git merge --no-ff &amp;#x3C;dep&gt;&lt;/code&gt;) brings that
branch’s commits in as a merge’s second parent. No approved work package owns them, so the
closed-world check names them as un-attributable, and the run rolls back. If those commits
really are an external dependency, declare the ref on the preview and the run:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--mission&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;slug&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--dependency-ref&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;dependency-branch&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--dry-run&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--mission&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;slug&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--dependency-ref&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;dependency-branch&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;A declaration that names Mission work, a ref that moved since the claim, or a different set on
&lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; is refused with a &lt;code dir=&quot;auto&quot;&gt;DEPENDENCY_REF_*&lt;/code&gt; code (see the
&lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate-exit-codes-and-refusal-codes&quot;&gt;refusal codes&lt;/a&gt;).
The check cannot detect every removed work package: a raw-SHA declaration skips the branch-name guard, and a removed work package that left no recorded lane head, no lane-tip ref and no namespaced branch looks like any other dependency. If the commits are a removed or canceled work package’s, do not declare them; see
&lt;a href=&quot;/guides/how-to/missions/merge-mission/#restack-onto-a-newer-dependency-branch&quot;&gt;restack onto a newer dependency branch&lt;/a&gt;.&lt;/p&gt;
&lt;h3 id=&quot;a-lane-changed-after-its-work-package-was-approved&quot;&gt;A lane changed after its work package was approved&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Reconciliation refused (fail-closed) at claim time, before any change: LANE_MOVED_AFTER_APPROVAL: ...&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; only lands what review approved. It compares each code lane with the lane commit recorded when the WP was approved, and refuses before any branch moves. The message names the lane, the WP and the commit, and prints the commands to run.&lt;/p&gt;

























&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Code&lt;/th&gt;&lt;th&gt;What happened&lt;/th&gt;&lt;th&gt;What to do&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;LANE_MOVED_AFTER_APPROVAL&lt;/code&gt;&lt;/td&gt;&lt;td&gt;A commit was made on the lane after the WP was approved&lt;/td&gt;&lt;td&gt;Send the WP back with the printed &lt;code dir=&quot;auto&quot;&gt;spec-kitty agent tasks move-task &amp;#x3C;WP&gt; --to in_progress --mission &amp;#x3C;slug&gt;&lt;/code&gt;, have it reviewed, approve it again, then re-run &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt;. This also applies to a fix made after approval&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;APPROVAL_STAMP_NOT_ON_LANE&lt;/code&gt;&lt;/td&gt;&lt;td&gt;The lane was rewritten (amended or rebased) after approval&lt;/td&gt;&lt;td&gt;Same: send the WP back and approve it again&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;APPROVAL_STAMP_MISSING&lt;/code&gt;&lt;/td&gt;&lt;td&gt;The approval recorded no lane commit. Every approval made with a release before 4.0.0rc5 is in this state&lt;/td&gt;&lt;td&gt;Approve the WP again, or attest it (below)&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;
&lt;p&gt;For &lt;code dir=&quot;auto&quot;&gt;APPROVAL_STAMP_MISSING&lt;/code&gt; only, you can attest that the lane as it stands is what was reviewed. Check the lane by hand first:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--mission&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;&amp;#x3C;slug&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--attest-approved-reviewed&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP01&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--attest-approved-reviewed&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP02&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--attest-reason&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#984E4D&quot;&gt;&amp;#x3C;what you checked&gt;&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&quot;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;The attestation is recorded with your name and reason. It does not lift the other two codes, and &lt;code dir=&quot;auto&quot;&gt;orchestrator-api consolidate-mission&lt;/code&gt; has no attestation flag: use the CLI.&lt;/p&gt;
&lt;p&gt;If a &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; is refused this way after an earlier attempt already moved the target, the message says so. Run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt; first: until then the local target holds content from the interrupted attempt.&lt;/p&gt;
&lt;p&gt;On a lane that holds both an approved and a canceled WP, &lt;code dir=&quot;auto&quot;&gt;--attest-canceled-superseded&lt;/code&gt; no longer covers work done after the approval. The approved WP must be approved again as well.&lt;/p&gt;
&lt;p&gt;The codes are defined in the &lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate-exit-codes-and-refusal-codes&quot;&gt;CLI reference&lt;/a&gt;. The attribution rules and the full verdict table are in the &lt;a href=&quot;/architecture/status-model/#commit-attribution-stamp-policy_metadatalane_head&quot;&gt;status model&lt;/a&gt;.&lt;/p&gt;
&lt;h3 id=&quot;a-branch-moved-without-a-record&quot;&gt;A branch moved without a record&lt;/h3&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;text&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Error: Refusing to continue this consolidation: the merge record cannot explain where these branches are now (neither their restore target nor a tip this consolidation recorded or provably wrote):&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;&amp;#x3C;branch&gt;: restore target &amp;#x3C;sha&gt;, live &amp;#x3C;sha&gt;&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Nothing was changed and the merge record is kept. To continue:&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;...&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;Error code: UNEXPLAINED_BRANCH_MOVE.&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;A re-run or &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; found a branch of an unfinished consolidation at a commit the merge record cannot account for. Typical causes: the earlier run was killed right after it moved the branch and before it recorded the move, or someone committed on the branch while the record was still open. The command stops before it moves anything, exits 1 and keeps the record. Running it again gives the same answer.&lt;/p&gt;
&lt;ol&gt;
&lt;li&gt;Inspect the commits the message names: &lt;code dir=&quot;auto&quot;&gt;git log &amp;#x3C;restore-target&gt;..&amp;#x3C;live&gt;&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;If these commits should not stay, move the branch yourself; spec-kitty never moves a commit it cannot prove is its own.&lt;/li&gt;
&lt;li&gt;To keep them, release the branch and clear the record: &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort --release-branch &amp;#x3C;branch&gt; --release-reason &quot;&amp;#x3C;why&gt;&quot;&lt;/code&gt; (see &lt;a href=&quot;#keep-a-branch-that-cannot-be-restored&quot;&gt;Keep a branch that cannot be restored&lt;/a&gt;). A release keeps every commit the &lt;code dir=&quot;auto&quot;&gt;git log&lt;/code&gt; listed on the branch, including any change of this consolidation that was never verified; the next consolidation still verifies them, and refuses with &lt;code dir=&quot;auto&quot;&gt;APPROVED_CONTENT_MISSING&lt;/code&gt; if one dropped approved code. Then start the consolidation again.&lt;/li&gt;
&lt;/ol&gt;
&lt;p&gt;A resume whose landing was already verified, with the target still at that commit, is not refused; it finishes the cleanup.&lt;/p&gt;
&lt;p&gt;Known cases that refuse this way, even though nobody else touched the branch:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;The run was killed right after a commit it makes without first saving where it moves the branch: the mission-number bake commit in the repository root checkout, or a plain status commit on the target.&lt;/li&gt;
&lt;li&gt;You ran &lt;code dir=&quot;auto&quot;&gt;git pull&lt;/code&gt; (or committed) on the target after a hard kill, before re-running or aborting.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Not covered yet: &lt;code dir=&quot;auto&quot;&gt;orchestrator-api&lt;/code&gt;’s planning-closeout path reports this refusal as &lt;code dir=&quot;auto&quot;&gt;PREFLIGHT_FAILED&lt;/code&gt; without the code, and &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --dry-run&lt;/code&gt; does not predict it.&lt;/p&gt;
&lt;h3 id=&quot;exit-code-75-the-landing-stands&quot;&gt;Exit code 75: the landing stands&lt;/h3&gt;
&lt;p&gt;Exit code 75 with &lt;code dir=&quot;auto&quot;&gt;Error code: COORD_MOVED_AFTER_LANDING.&lt;/code&gt; means the landing is verified, but a commit reached the coordination branch (or the mission branch) before it could be deleted. The branch is kept and nothing is rolled back. For a coordination branch, review the late commits with the &lt;code dir=&quot;auto&quot;&gt;git log&lt;/code&gt; command in the message, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;.&lt;/p&gt;
&lt;p&gt;See &lt;a href=&quot;/guides/how-to/recovery/recover-from-interrupted-merge/#exit-code-75-the-landing-stands-the-cleanup-did-not-finish&quot;&gt;Exit code 75&lt;/a&gt; for the mission-branch variant.&lt;/p&gt;
&lt;h2 id=&quot;see-also&quot;&gt;See Also&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;&lt;a href=&quot;/guides/how-to/missions/merge-mission/&quot;&gt;How to Merge a Mission&lt;/a&gt;: the normal consolidation flow&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/guides/how-to/missions/accept-and-merge/&quot;&gt;Accept and Merge&lt;/a&gt;: validation before consolidation&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/guides/how-to/missions/handle-dependencies/&quot;&gt;Handle Dependencies&lt;/a&gt;: WP dependency management&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate-exit-codes-and-refusal-codes&quot;&gt;CLI reference: exit codes and refusal codes&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/architecture/git-workflow/#4-consolidated&quot;&gt;Git workflow&lt;/a&gt;: what each consolidation step does&lt;/li&gt;
&lt;/ul&gt;</content>
</entry>
