Use previous branch instead of hard code

Piszmog · Sep 27, 2022 · 5101c03 · 5101c03
1 parent ca3c045
commit 5101c03
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main.rs b/src/main.rs
@@ -39,7 +39,7 @@ fn main() {
             let up_to_date = is_up_to_date(repo_dir, previous_branch);
 
             if !up_to_date {
-                let has_conflicts = has_conflicts(repo_dir, "main");
+                let has_conflicts = has_conflicts(repo_dir, previous_branch);
                 if !has_conflicts {
                     println!("Merging {:?} into {:?}...", previous_branch, branch);
                     merge(repo_dir, previous_branch);