Added better deletion

benedikt-schesch · May 26, 2024 · a5362e2 · a5362e2
1 parent 86b4f5f
commit a5362e2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh
@@ -63,6 +63,7 @@ if [ "$conflicts_resolved" = false ]; then
     echo "Conflict detected. Aborting the merge. Please resolve the conflicts."
     echo "All conflicting files:"
     echo "$conflict_files"
+    rm -rf $temp_out_dir $temp_intellimerge_dir
     exit 1
 fi