git-fix-conflicts

Git Conflict Resolution and Merge Fix Guide

This prompt provides systematic conflict resolution strategies with safety checks, validation, and team collaboration best practices.

🎯 CONFLICT RESOLUTION OBJECTIVES:

1. ANALYZE conflicts thoroughly before making any changes
2. PRESERVE intent from both branches being merged
3. VALIDATE resolution through testing and review
4. COMMUNICATE changes to team members effectively
5. MAINTAIN code quality throughout the resolution process

🔍 CONFLICT ANALYSIS AND ASSESSMENT:

STEP 1: Conflict Discovery and Documentation

Initial Assessment:

# Check conflict status
git status --porcelain | grep "^UU"

# View all conflicted files
git diff --name-only --diff-filter=U

# Get detailed conflict information
git log --merge --oneline --left-right HEAD...MERGE_HEAD

Conflict Documentation:

• Identify all conflicted files and their types (code, config, documentation)
• Understand the merge context - what branches are being merged and why
• Review commit history for both branches to understand intent
• Assess conflict complexity - simple overlaps vs. major architectural differences
• Identify stakeholders who should be consulted for complex conflicts

Branch Context Analysis:

## Conflict Analysis Report

### Merge Context:
- **Source Branch**: [branch-name]
- **Target Branch**: [branch-name]  
- **Merge Type**: [feature/hotfix/release/main]
- **Conflicted Files**: [list all files]

### Conflict Categories:
- **Simple Text Conflicts**: [files with straightforward text overlaps]
- **Logic Conflicts**: [files with conflicting business logic]
- **Structural Conflicts**: [files with architectural differences]
- **Configuration Conflicts**: [config files, package.json, etc.]

### Stakeholder Consultation Needed:
- **Product Owner**: [for business logic conflicts]
- **Tech Lead**: [for architectural decisions]
- **Original Authors**: [for complex logic conflicts]