monarch-rs 0.1.0

Advanced Git Management Suite for handling multiple repositories concurrently
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

//! Interactive conflict resolution

use crate::conflict::detector::Conflict;

/// Resolution strategy
pub enum ResolutionStrategy {
    /// Keep our version
    Ours,
    /// Keep their version
    Theirs,
    /// Manually edit
    Manual,
    /// Keep both versions
    Both,
    /// Skip file
    Skip,
    /// Abort resolution
    Abort,
}

/// Resolves a conflict
pub fn resolve_conflict(conflict: &Conflict, strategy: ResolutionStrategy) -> anyhow::Result<()> {
    todo!("Implement conflict resolution")
}

/// Gets available resolution strategies for a conflict
pub fn get_resolution_strategies(conflict: &Conflict) -> Vec<ResolutionStrategy> {
    todo!("Implement strategy retrieval")
}

/// Launches an interactive conflict resolution session
pub fn start_interactive_resolution(repo_path: &str) -> anyhow::Result<()> {
    todo!("Implement interactive conflict resolution")
}