pub fn fast_forward_conflict( spec_id: &str, spec_branch: &str, main_branch: &str, stderr: &str, ) -> String