computer-playbook

kevinveenbirkenbach/computer-playbook

0 Fork 0

mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2026-11-07 19:32:17 +00:00

Commit Graph

Author	SHA1	Message	Date
kevinveenbirkenbachandClaude Opus 5	e595ddc194	docs(skills): add i8-merge-sibling for pulling and merging a sibling branch Five requests in one session ran the same chain by hand: fetch, merge, resolve, gate, wait for the commit decision. The conflict doctrine that emerged from those merges is now written down instead of re-derived each time — union additive lists, prefer the SPOT variable over an inlined duplicate, keep the conventions this branch's lint enforces, and take the side that fails loudly. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-07-30 18:14:28 +02:00

Author

SHA1

Message

Date

kevinveenbirkenbachandClaude Opus 5

e595ddc194

docs(skills): add i8-merge-sibling for pulling and merging a sibling branch

Five requests in one session ran the same chain by hand: fetch, merge, resolve,
gate, wait for the commit decision. The conflict doctrine that emerged from
those merges is now written down instead of re-derived each time — union
additive lists, prefer the SPOT variable over an inlined duplicate, keep the
conventions this branch's lint enforces, and take the side that fails loudly.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

2026-07-30 18:14:28 +02:00