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

//! Conflict visualization

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

/// Conflict section
pub struct ConflictSection {
    /// Our version
    pub ours: Vec<String>,
    /// Their version
    pub theirs: Vec<String>,
    /// Base version
    pub base: Option<Vec<String>>,
    /// Line number in the file
    pub line_number: usize,
}

/// Parses conflict sections from a file
pub fn parse_conflict_sections(file_path: &str) -> anyhow::Result<Vec<ConflictSection>> {
    todo!("Implement conflict section parsing")
}

/// Renders a conflict for visualization
pub fn render_conflict(conflict: &Conflict) -> anyhow::Result<String> {
    todo!("Implement conflict rendering")
}

/// Launches a visual conflict browser
pub fn launch_conflict_browser(repo_path: &str) -> anyhow::Result<()> {
    todo!("Implement conflict browser")
}