git-github-conflict-resolve - Git Merge Conflict Resolution
Identify and resolve Git merge conflicts with multiple resolution strategies
Tags
Updated: 2026-03-22Capabilities
Typical Inputs
Typical Outputs
What this skill does
- detect conflict markers
- list conflicted files
- view conflict details
- keep current branch changes
- keep incoming branch changes
- resolve conflicts manually
- accept both changes
- configure merge tool
- run merge tool
- stage resolved files
- complete merge
- verify resolution
- abort merge
- configure rerere
Inputs
- Git repository
- conflicted file
- conflict description
- conflict marker
- base commit
- merge tool
Outputs
- resolved conflict file
- merged branch
- merge commit
- configuration change
- resolution report
- verification result
Requirements
- Git repository
- file system access
- command line access
- merge tool