Fix pr_merge_main() (#2026)

olivroy · web-flow · commit 0e773f940816 · 2024-07-24T19:27:35.000-07:00
diff --git a/R/utils-git.R b/R/utils-git.R
@@ -229,8 +229,7 @@ git_conflict_report <- function() {
   no <- "No, I want to abort this merge."
   choice <- utils::menu(
     title = "Do you want to proceed with this merge?",
-    choices = c(yes, yes_soft, no),
-    title = msg
+    choices = c(yes, yes_soft, no)
   )
 
   if (choice < 1 || choice > 2) {

Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,7 @@ git_conflict_report <- function() {`
`229`	`229`	`no <- "No, I want to abort this merge."`
`230`	`230`	`choice <- utils::menu(`
`231`	`231`	`title = "Do you want to proceed with this merge?",`
`232`		`- choices = c(yes, yes_soft, no),`
`233`		`- title = msg`
	`232`	`+ choices = c(yes, yes_soft, no)`
`234`	`233`	`)`
`235`	`234`
`236`	`235`	`if (choice < 1 \|\| choice > 2) {`