Logical conflict file added (#7924)

Co-authored-by: trunk bot <[email protected]>
trunk-io · Apr 3, 2024 · 8845ca2 · 8845ca2
1 parent cecc932
commit 8845ca2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -145,6 +145,8 @@ fn maybe_add_logical_merge_conflict(config: &Conf) -> bool {
         let filename = &config.pullrequest.logical_conflict_file;
         std::fs::write(filename, "simulate logical merge conflict")
             .expect("Unable to write logical merge conflict file");
+
+        git(&["add", &config.pullrequest.logical_conflict_file]);
         return true;
     }
     false