resolve-rebase-conflicts
This skill uses Claude hooks which can execute code automatically in response to events. Review carefully before installing.
Resolve rebase conflicts
Settle every conflicted path and stage it, so the rebase can advance. This skill ends there. Continuing the replay and verifying the result belong to the rebase skill.
A guard hook runs alongside. It refuses --ours and --theirs, which mean the opposite of what they read during a rebase, and it refuses staging a file with markers still in it.
The inversion, once
During a rebase git checks out the base and replays your commits onto it. Your work is the side arriving, so git calls it --theirs, and the base you are moving onto becomes --ours. Every intuition about which word means which runs backwards here, and a wrong pick resolves cleanly and stays wrong.
Nothing in this skill uses either word. The sides are:
base-sideis the commit the branch replays onto. git calls it--ours, and the index calls it stage 2.replayed-sideis the commit git is replaying right now. git calls it--theirs, and the index calls it stage 3.
The scripts read the index stages rather than the marker labels, so the naming holds under whatever marker style the repository sets.