Structs§
- Conflict
Analysis - Complete analysis of all conflicts in a rebase/merge operation
- Conflict
Analyzer - Analyzes conflicts in files and provides resolution guidance
- Conflict
Region - Represents a conflict region in a file
- File
Conflict Analysis - Analysis result for a file with conflicts
Enums§
- Conflict
Difficulty - Difficulty level for resolving a conflict
- Conflict
Type - Type of conflict detected
- Resolution
Strategy - Strategy for resolving a conflict