resolve-conflictslisted

<!-- Generated from https://github.com/nielsmadan/agentic-coding — edits here are overwritten. --> # Resolve Conflicts Resolve git conflicts from any operation with proper continuation workflow. ## Usage ``` /resolve-conflicts # Resolve all conflicts /resolve-conflicts path/to/file # Focus on specific file ``` ## Gotchas - A conflicted tree with **no sentinel file** is not automatically a stash/manual conflict. The most common trap is a `git pull --rebase` (autostash) whose re-apply conflicted: the rebase already finished, so no `rebase-merge/` exists, but the markers are real. Read the reflog + stash list before classifying — see Step 1. - During rebase, ours/theirs semantics are INVERTED. "Ours" is the branch being rebased onto (the target), not your working branch. This causes wrong-direction resolutions if you forget. - Lock file conflicts (package-lock.json, yarn.lock, Podfile.lock) must NEVER be manually resolved. Delete the lock file and regenerate it — manual merging produces corrupt files. ## Workflow ### Step 1: Detect State Never infer the state from the conflict markers alone, and never assume "no sentinel file" means a simple manual conflict. Gather the full picture first with one command, then classify: ```bash git status; echo "=== STASH ==="; git stash list; echo "=== REFLOG ==="; git reflog -n 6 ``` Then use Glob to check for sentinel files in `.git/`: - `.git/MERGE_HEAD` → **Merge** - `.git/rebase-merge` or `.git/rebase-apply` → **Reba