Skip to content

Clarify generated git handoff merge instructions - #30

Open
darlingm wants to merge 1 commit into
unclebob:mainfrom
darlingm:fix/clarify-merge-handoff-payload
Open

Clarify generated git handoff merge instructions#30
darlingm wants to merge 1 commit into
unclebob:mainfrom
darlingm:fix/clarify-merge-handoff-payload

Conversation

@darlingm

@darlingm darlingm commented Jul 17, 2026

Copy link
Copy Markdown

Summary

  • Replace the command-shaped merge_and_process <sender> <commit> payload with a direct natural-language merge instruction.
  • Keep Git mechanics and conflict handling with the receiving role rather than introducing a new helper or mandatory shell command.
  • Update the shared handoff rules, protocol examples, generated-payload assertions, and queue fixtures.
  • Assert that generated handoffs no longer contain merge_and_process.

Generated payloads now say:

Merge commit <commit> from role <sender> into your current branch. Then process the merged state according to your role and constitution.

Fix 1 of 2 for #29. The companion change is #31 on six-pack, which has one project-local reference to the same pseudo-command.

Test plan

  • bb test — 24 tests, 92 assertions, 0 failures, 0 errors

Replace command-shaped merge_and_process pseudo-code with a direct natural-language merge instruction at the point of use. Keep the receiving role responsible for Git mechanics and role-specific processing.

Fix 1 of 2 for unclebob#29.

Co-authored-by: GPT-5.6-sol (high) via Codex <noreply@openai.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant