From 390404bde87ca80d7140c0ed085480d697df8247 Mon Sep 17 00:00:00 2001 From: Seungwoo321 Date: Tue, 5 Aug 2025 22:05:33 +0900 Subject: [PATCH] fix: use fast-forward merge for true synchronization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove --no-ff flag to allow fast-forward merges - True sync: git merge main → fast-forward (no new commits) - Update infinite loop prevention to check github-actions bot author - Cleaner commit history without unnecessary merge commits --- .github/workflows/integrate-develop.yml | 4 ++-- .github/workflows/update-version.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integrate-develop.yml b/.github/workflows/integrate-develop.yml index 75b45e1..841ac8c 100644 --- a/.github/workflows/integrate-develop.yml +++ b/.github/workflows/integrate-develop.yml @@ -13,8 +13,8 @@ jobs: create-or-update-pr: name: Create or Update PR to Staging runs-on: ubuntu-latest - # Skip if this is a sync commit from main - if: "!contains(github.event.head_commit.message, 'chore: sync version updates from main')" + # Skip if this is a sync from main (by github-actions bot) + if: "github.event.head_commit.author.name != 'github-actions[bot]'" permissions: contents: write pull-requests: write diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index e9783c1..7c46080 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -142,8 +142,8 @@ jobs: git fetch origin develop:develop git checkout develop - # Merge main changes - git merge main --no-ff -m "chore: sync version updates from main" + # Merge main changes (allow fast-forward for clean sync) + git merge main # Push directly to develop git push origin develop @@ -160,8 +160,8 @@ jobs: git fetch origin staging:staging git checkout staging - # Merge main changes - git merge main --no-ff -m "chore: sync version updates from main" + # Merge main changes (allow fast-forward for clean sync) + git merge main # Push directly to staging git push origin staging