skill
★ 394
Git Merge Conflict Resolution Skill
This skill resolves complex git merge conflicts by analyzing both conflicting branches' intents. It ensures code correctness, type safety, and test passing while preferring to combine changes rather than discarding them.
sipyourdrink-ltd/bernstein
git-merge
conflict-resolution
version-control
code-merging