git-merge-conflict-resolver

This skill provides git merge support for resolving conflicts. Use this skill ONLY if the merge has conflict or if you are in the middle of a merge with conflict. Do NOT use this skill if the merge has no conflict. Do NOT attempt to resolve merge conflicts yourself - always use this skill instead. Indicators to use this skill include errors such as "error: Merging is not possible because you have unmerged files." or "fatal: Exiting because of an unresolved conflict."