Software Development

Resolving Merge Conflicts

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

Publisher / source
Antigravity Skills
Upstream record
sickn33/antigravity-awesome-skills
Version
Version 2
Published
Publication review
Approved for publication · recorded passed scan 2026-10-23
Content fingerprint
d78789e5bd454dbc550f3249d7b8db738e8bcee12b4278fbd1f2339480ee565e