fix-merge-conflicts

Fix merge conflicts

If the current project has .claude/skills/fix-merge-conflicts/SKILL.md or .opencode/skills/fix-merge-conflicts/SKILL.md, read it and its references/; project specifics override this generic version.

Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state. Prefer rebase (linear history) over merge when safe.

Hard Rules

1. Never break behavior. Minimal, correctness-first edits only. Preserve intent, both sides when safe.
2. Back up first. Create a backup branch before starting; restore from it if you abort or hit verification failures.
3. Abort on doubt. Any conflict about intent (not just text), verification failing twice, or data-model conflicts (EF Migrations, ORM snapshots) → git rebase --abort, restore backup, STOP.
4. Stage explicit paths only. Never git add -A, ., or commit -a. Always git add -- <path> <path> for specific files.
5. No hooks or config changes. Never pass --no-verify, never use git rebase -i, never edit git config or rerere settings.
6. Push only with explicit consent. Present the push command and await human approval; never push without it.

Preflight

Before starting the rebase:

1. Run git status --porcelain. Any output → STOP. Commit or stash uncommitted changes first.
2. Check for in-progress merge or rebase: git rev-parse --git-path MERGE_HEAD and git rev-parse --git-path rebase-merge. If either exists, ask the human about git merge --abort or git rebase --abort to clear it.
3. Run git fetch origin to ensure base ref is current.
4. Determine the base: ask for the base ref (e.g., origin/main), or run gh pr view --json baseRefName to extract it from the PR.
5. Record the current HEAD SHA and upstream SHA (@{u}): git rev-parse HEAD and git rev-parse @{u}.

Backup

1. Generate backup branch name: backup/<branch-name-with-slashes-as-hyphens>-<YYYYMMDDHHMM> (lowercase).
2. Validate against regex ^backup/[a-z0-9]+(-[a-z0-9]+)*$.
3. Create backup: git branch backup/<name>. Confirm it matches the regex. When a goal is active (.claude/state/goal.json exists), record it with agent-harness goal backup-add <name>.