Module conflict_analysis

Module conflict_analysis 

Source

Structs§

ConflictAnalysis
Complete analysis of all conflicts in a rebase/merge operation
ConflictAnalyzer
Analyzes conflicts in files and provides resolution guidance
ConflictRegion
Represents a conflict region in a file
FileConflictAnalysis
Analysis result for a file with conflicts

Enums§

ConflictDifficulty
Difficulty level for resolving a conflict
ConflictType
Type of conflict detected
ResolutionStrategy
Strategy for resolving a conflict