resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

Reference it in any coding agent with:

@skills aiskillstore/resolving-merge-conflicts