Method merge_conflict

src/error.rs:16–23

(branch: String, upstream: String, message: Option<String>)

    }

    fn merge_conflict(branch: String, upstream: String, message: Option<String>) -> Self {
        let mut error_msg = format!("Merge conflict between {} and {}", upstream, branch);
        if let Some(details) = message {
            error_msg.push('\n');
            error_msg.push_str(&details);
        }
        Error::from_str(&error_msg)
    }

    fn git_command_failed(command: String, status: i32, stdout: String, stderr: String) -> Self {
        let error_msg = format!(