Refactor

R/utils-git.R

@@ -225,30 +225,27 @@ git_conflict_report <- function() {
   ))
 
   msg <- "Are you ready to sort this out?"
-  yes <- "Yes, open the files. I'm ready to resolve the merge conflicts."
-  yes_soft <- "Yes, but don't open the files. I will resolve the merge conflicts."
+  yes <- "Yes, open the conflicted files for editing."
+  yes_soft <- "Yes, but do not open the conflicted files."
   no <- "No, I want to abort this merge."
-  merge_strategy <- utils::menu(
+  choice <- utils::menu(
     choices = c(yes, yes_soft, no),
     title = msg
   )
-  if (merge_strategy == 1) {
-    ui_silence(purrr::walk(conflicted, edit_file))
-    ui_abort(c(
-      "Please fix each conflict, save, stage, and commit.",
-      "To back out of this merge, run {.code gert::git_merge_abort()}
-       (in R) or {.code git merge --abort} (in the shell)."
-    ))
-  } else if (merge_strategy == 2) {
-    ui_abort(c(
-      "Please fix each conflict, save, stage, and commit.",
-      "To back out of this merge, run {.code gert::git_merge_abort()}
-       (in R) or {.code git merge --abort} (in the shell)."
-    ))
-  } else {
+
+  if (choice < 1 || choice > 2) {
     gert::git_merge_abort(repo = git_repo())
     ui_abort("Abandoning the merge, since it will cause merge conflicts.")
   }
+
+  if (choice == 1) {
+    ui_silence(purrr::walk(conflicted, edit_file))
+  }
+  ui_abort(c(
+    "Please fix each conflict, save, stage, and commit.",
+    "To back out of this merge, run {.code gert::git_merge_abort()}
+     (in R) or {.code git merge --abort} (in the shell)."
+  ))
 }
 
 # Remotes ----------------------------------------------------------------------