ask first for merge and then for pull, otherwise you do not have the …

…latest changes locally
lorenzwalthert · Jul 23, 2024 · 612fafb · 612fafb
1 parent b3dfcea
commit 612fafb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/R/release.R b/R/release.R
@@ -98,14 +98,14 @@ release_msg <- function(last_release, new_version) {
 #' @param tag The tag to push. `NULL` will derive the tag from `DESCRIPTION`.
 #' @keywords internal
 release_complete <- function(ask = TRUE, is_cran = ask, tag = NULL) {
-  abort_if_not_yes("Are you on main branch with no changes in worktree?")
-  if (git_branch_get() != "main") {
-    rlang::abort("Must be on main to complete the release.")
-  }
   if (ask) {
     abort_if_not_yes("Did you merge the release branch into main?")
     abort_if_not_yes("Did you pull the latest main from origin?")
   }
+  abort_if_not_yes("Are you on main branch with no changes in worktree?")
+  if (git_branch_get() != "main") {
+    rlang::abort("Must be on main to complete the release.")
+  }
   if (is_cran) {
     if (is.null(tag)) {
       tag <- paste0("v", desc::desc_get_version())