Skip to content

Commit

Permalink
Exit if there are merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Piszmog committed Sep 27, 2022
1 parent 4c6bdc8 commit ca3c045
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ fn main() {
println!("Pushing updated {:?}...", branch);
push(repo_dir);
} else {
println!("There are merge conflicts between {:?} and {:?}. Manually resolve before running again.", previous_branch, branch)
println!("There are merge conflicts between {:?} and {:?}. Manually resolve before running again.", previous_branch, branch);
return;
}
} else {
println!("{:?} is up-to-date with {:?}", branch, previous_branch)
println!("{:?} is up-to-date with {:?}", branch, previous_branch);
}
}
previous_branch = branch;
Expand Down

0 comments on commit ca3c045

Please sign in to comment.