resolve-rebase-conflicts

# 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 that still carries markers. ## 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-side` is the commit the branch replays onto. git calls it `--ours`, and the index calls it stage 2. - `replayed-side` is 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. ## Marker shape With `merge.conflictStyle` set to `diff3` or `zdiff3`, a conflict carries three sections rather than two: ```text <<<<<<< HEAD the base-side content ||||||| <ancestor label> what both sides started from ======= the replayed-side content >>>>>>> <commit> (<subject>) ``` That `|||||||` section is the common ancestor, and it's the most useful part of the b...