Reconcile declared intent, code, and result when finishing a merge

[EdbertChan]

Summary

When the agent finishes a merge or rebase, it now checks that three things agree before calling it done.

Those three are what each side said it meant to do, what each side's code does, and what the combined result does.

A merge can finish with no conflict and still break one side's work, so the agent checks every merge.

If the three disagree, it stops and tells you, with the history and test output that show why.

Review Claim

The learned working-style rule for finishing a merge or rebase requires declared intent, code, and result to agree, and requires a flag with evidence when they do not.

Review Lane

behavior

Review Unit

corpus-lesson

Safety Invariant

Taking one side's whole file stays forbidden; the rule only adds checks and a stop-and-flag path, and never tells the agent to pick a side on its own.

Slice Rationale

One rule and its test, replacing this PR's earlier, narrower whole-file rule in place.

Non-goals

• No hook enforces the check yet.
• No change to how the merge queue or the stack tools rebase.

Test Plan

Test Plan

• python3 -m unittest tests.test_conflict_whole_side_rule -v

  rule text from the earlier version of this PR:
  FAIL: test_rule_checks_clean_merges_too ... AssertionError: the conflict-resolution rule is missing
  FAIL: test_rule_flags_mismatch_with_history_and_evidence ... (same)
  FAIL: test_rule_forbids_taking_a_whole_side ... (same)
  FAIL: test_rule_names_its_source ... (same)
  
  revised rule:
  Ran 7 tests in 4.220s
  OK
  

• The two real-git premise tests pass: git checkout --theirs drops a non-conflicting hunk, and a textually clean merge fails the test the other branch's commit named.
• Source check: the cited paper's conclusion reads "33% of merges that were reported to contain no textual conflicts by the VCS in fact contained higher-order conflicts" (Brun et al., ESEC/FSE 2011, fetched PDF).
• Rebasing Keep approved fix-later items in every status update #739 onto this revision conflicted in corpus/CLAUDE.learned.md. Resolved with the rule itself: Keep approved fix-later items in every status update #739's commit and PR body declare one added line, the old whole-file line was only context, and the diff against this commit is exactly Keep approved fix-later items in every status update #739's line. tests.test_deferred_items_rule and this PR's tests: Ran 8 tests ... OK. Search saved memory both ways before a deep dive #740 rebased cleanly; its added lines are unchanged and tests.test_check_memory_first_rule passes.
• bash scripts/test/run_all_tests.sh on the rebased stack (Classify corpus/CLAUDE.learned.md as a corpus lesson #733 through Search saved memory both ways before a deep dive #740)

  RUN_ALL_EXIT=0
  total tests: 2396
  

Revert Plan

Revert Plan

• Safe to revert? Yes
• Revert command: git revert <sha>
• Post-revert steps: rerun ./install.sh so installed copies match
• Data migration? No

🤖 Generated with Claude Code

[EdbertChan]

This pull request is part of a Mergify stack:

#	Pull Request	Link
1	Reconcile declared intent, code, and result when finishing a merge	#738	👈
2	Keep approved fix-later items in every status update	#739
3	Search saved memory both ways before a deep dive	#740

[EdbertChan]

Revision history

#	Type	Changes	Reason	Date
1	initial	047448a		2026-09-17 00:49 UTC
2	content	047448a → 5b27b14 (raw)		2026-09-17 00:49 UTC
3	rebase	5b27b14 → 5642a01 (rebase only)		2026-09-17 04:23 UTC
4	rebase	5642a01 → 462018d (rebase only)		2026-09-17 04:37 UTC
5	rebase	462018d → ef089ee (rebase only)		2026-09-17 04:55 UTC
6	rebase	ef089ee → bf3fe1e (rebase only)		2026-09-17 05:11 UTC
7	rebase	bf3fe1e → 937de7d (rebase only)		2026-09-17 05:26 UTC

[cursor]

Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 462018d. Configure here.}

[EdbertChan]

Mergify repair stopped: unresolved human review thread PRRT_kwDOT3uYWs6jNYzC

[mergify]

Queued — the merge queue status continues in this comment ↓.

[EdbertChan]

@Mergifyio queue

[mergify]

Merge Queue Status

• ✅ Entered queue — 2026-09-17 05:33 UTC · Rule: admin-bypass · triggered by @EdbertChan with the @mergifyio queue command
• ✅ Checks passed · on draft merge queue: checking #738 on main (d5803c7) #760
• ✅ Merged — 2026-09-17 05:39 UTC · at 7499e5956310c90dff60e0df917612efdfb23316 · squash

This pull request spent 5 minutes 47 seconds in the queue, including 5 minutes 20 seconds running CI.

Required conditions to merge

• check-success = lint
• check-success = test
• check-success = validate