Fetch and pull main branch

skuzzle · Jan 24, 2024 · 2dc7d6b · 2dc7d6b
1 parent 6bede25
commit 2dc7d6b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build-logic/release-plugin/src/main/kotlin/de/skuzzle/release/ReleaseGitLocalTask.kt b/build-logic/release-plugin/src/main/kotlin/de/skuzzle/release/ReleaseGitLocalTask.kt
@@ -29,8 +29,10 @@ abstract class ReleaseGitLocalTask : AbstractReleaseStep() {
         }
 
         if (mergeBranches.get()) {
-            print("Merging release tag $releaseTagName into ${mainBranch.get()}")
+            print("Merging release tag $releaseTagName into ${mainBranch.get()} (current branch: ${git.currentBranch()})")
+            git.git("fetch", "origin", mainBranch.get())
             git.git("checkout", mainBranch.get())
+            git.git("pull")
             git.git("merge", releaseTagName, "--strategy-option", "theirs")
         }
     }