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
35
36
37

//! Conflict detection across repositories

/// Represents a detected conflict
pub struct Conflict {
    /// Repository path
    pub repo_path: String,
    /// File path with conflict
    pub file_path: String,
    /// Conflict description
    pub description: String,
    /// Conflict type
    pub conflict_type: ConflictType,
}

/// Types of conflicts
pub enum ConflictType {
    /// Merge conflict
    Merge,
    /// Rebase conflict
    Rebase,
    /// Cherry-pick conflict
    CherryPick,
    /// Stash apply conflict
    StashApply,
    /// Other conflict type
    Other(String),
}

/// Detects conflicts in a repository
pub fn detect_conflicts(repo_path: &str) -> anyhow::Result<Vec<Conflict>> {
    todo!("Implement conflict detection")
}

/// Checks if a repository has conflicts
pub fn has_conflicts(repo_path: &str) -> anyhow::Result<bool> {
    todo!("Implement conflict check")
}