Skip to content

Commit 8461349

Browse files
sungbin1015claude
andcommitted
fix(ci): merge-develop 커밋 메시지에 [skip-notion] 추가 — md-to-notion.yml 오트리거 방지
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent a2a0d67 commit 8461349

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/merge-develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
git checkout main
6666
git pull origin main
6767
68-
if git merge develop --no-edit; then
68+
if git merge develop -m "chore: develop → main 머지 [skip-notion]"; then
6969
git push origin main
7070
echo "머지 완료 (충돌 없음)"
7171
exit 0
@@ -83,5 +83,5 @@ jobs:
8383
echo ".notion-sync.json 충돌 자동 해소 (main 버전 유지)"
8484
git diff --name-only --diff-filter=U | xargs -r git checkout --ours --
8585
git add -A
86-
git commit --no-edit
86+
git commit -m "chore: develop → main 머지 (sync-json 충돌 자동 해소) [skip-notion]"
8787
git push origin main

0 commit comments

Comments
 (0)