Git Rebase Conflict Resolution

Use this skill when Compozy asks you to resolve conflicts in an integration worktree. The goal is a clean merge result, not a clever shortcut.

Core Rules

Understand every conflicted hunk before editing it.
Preserve important behavior from both sides whenever possible.
Prefer the smallest readable merge that keeps the code idiomatic for the affected language and project.
Do not delete tests, weaken assertions, suppress lint, swallow errors, or otherwise hide a failing invariant.
Do not commit. Compozy owns the final squash commit.
Do not leave conflict markers in any file.
If a conflict is unsafe or unclear, leave it unresolved so Compozy can abort and roll back honestly.