---
description: Resolve local git conflicts and stage the resolved files; never continues the rebase — loads and follows the resolve-git-conflicts skill
agent: build
---

Load the **`resolve-git-conflicts`** skill and follow it as your only instruction.