Agent skill · laurigates
git-conflicts
Resolve merge conflicts file-by-file. Use when a merge/rebase has conflicts, a PR can't merge, \"fix conflicts\" is requested, or branches have diverged.
Reference it in any coding agent with:
@skills laurigates/git-conflicts