Module: Ocak::ConflictResolution
- Included in:
- MergeManager
- Defined in:
- lib/ocak/conflict_resolution.rb
Overview
Rebase and conflict resolution logic — rebase_onto_main, resolve_conflicts_via_agent. Extracted from MergeManager to reduce file size.
Rebase and conflict resolution logic — rebase_onto_main, resolve_conflicts_via_agent. Extracted from MergeManager to reduce file size.