Resolve Merge Conflict

Use when an approved ticket's delivery branch cannot auto-merge into the default branch because of a merge conflict. Invoke for "resolve the merge conflict on branch X", "the auto-merge conflicted — reconcile it", or when the factory's merge-ticket runner hands you a conflicting gaffer/* branch. Merge the default branch INTO the delivery branch, resolve every conflict by preserving BOTH intents, prove it with tests, and commit the resolution ON THE BRANCH — never land it to the default branch yourself.

tmj-90 Updated 1 repo stars
The Overview headline and scoreboard: eight things need you, the blocked ticket that leads them, three agents on the pitch, six tickets delivered today and the

File contents

tmj-90/gaffer commit 12d8394cd0 Runs: tmj-90/run-tests

Frequently asked questions

npx get-skill add tmj-90/resolve-merge-conflict