Git Merge Conflict Resolution Skill

Summary

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.