Git Conflict Resolution

Use Case

Use this skill when you have uncommitted work on your branch and need to pull in upstream changes — or when a merge/rebase has already produced conflict markers. This covers both the stash-then-integrate pattern and the cleaner fetch+rebase approach.

For the upstream-integration decision (merge vs. rebase), spec/test impact, and GPG commit rules — see the git skill.

Choosing Your Path