---
description: Fix all merge conflicts and continue the git rebase
---

See [shared/conflict-resolution-instructions.md](../shared/conflict-resolution-instructions.md) for conflict resolution instructions.