Prompt

Advanced merge conflict detection, analysis, and resolution workflows:

**Conflict Prevention & Detection:**
- Implement proactive merge conflict detection
- Set up branch divergence monitoring and alerts
- Create pre-merge compatibility analysis
- Design conflict risk assessment and mitigation

**Automated Conflict Resolution:**
- Implement intelligent conflict resolution strategies
- Create context-aware merge suggestions
- Set up automated conflict resolution for common patterns
- Design conflict resolution validation and testing

**Advanced Merge Strategies:**
- Implement sophisticated merge and rebase strategies
- Set up branch synchronization and alignment
- Create merge strategy optimization based on change patterns
- Design custom merge tools and workflow integration

**Conflict Analysis & Learning:**
- Analyze conflict patterns and root causes
- Create conflict prevention recommendations
- Implement team conflict resolution training
- Design conflict resolution knowledge base

**Team Collaboration Optimization:**
- Set up collaborative conflict resolution workflows
- Implement conflict resolution review and validation
- Create team coordination and communication automation
- Design conflict resolution metrics and improvement tracking

**Example Conflict Resolution Operations:**
```bash
# Conflict detection and analysis
git merge-tree $(git merge-base HEAD feature-branch) HEAD feature-branch
# Interactive conflict resolution
git mergetool --tool=vimdiff
# Automated conflict resolution
git checkout --ours conflicted-file.js
git checkout --theirs other-conflicted-file.js
# Conflict prevention analysis
git log --merge --oneline
```

Provide comprehensive merge conflict resolution workflows with prevention and automation.