From fb2b5472591b40e2f2d0731c4fcf8c061b635fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99drzy=C5=84ski?= <kedrzu@gmail.com>
Date: Wed, 22 Jan 2025 11:01:13 +0100
Subject: [PATCH] chore: auto-merge release -> main
---
.github/workflows/automerge-release.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/automerge-release.yml b/.github/workflows/automerge-release.yml
index 8550fd1..af49ab0 100644
--- a/.github/workflows/automerge-release.yml
+++ b/.github/workflows/automerge-release.yml
@@ -20,7 +20,5 @@ jobs:
- name: Merge release to main
id: mergeRelease
run: |
- git checkout main
- git pull
- git merge --no-ff release -m "chore: auto-merge release -> main"
+ git merge --no-ff origin/release -m "chore: auto-merge release -> main"
git push