Resolving Merge Conflicts

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

Authormattpocock

Version1.2.3

Last updatedAug 14, 2026

Catalog ID28

Included skills

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

Published metadata

name: resolving-merge-conflicts
version: 1.2.3
description: Use when you need to resolve an in-progress git merge/rebase conflict.