/git:conflicts Resolve merge conflicts using modern git features. When to Use This Skill | Use this skill when... | Use git-ops agent instead when... | |------------------------|-----------------------------------| | Merge or rebase produced conflicts | Complex multi-branch cherry-pick across many commits | | PR shows "can't merge" / "fix conflicts" | Conflicts require deep business logic understanding | | Config files (JSON, YAML, lockfiles) diverged | Interactive rebase with squash/fixup needed | | Need to accept one side wholesale ( / ) | Architectural redesign spanning many files | Contex…