chore(deps): sync upstream changes (2026-05-24) #3

Closed
mizuki wants to merge 9 commits from upstream-sync-202605240000 into dev
Showing only changes of commit 6001990b48 - Show all commits

i have low inteligence

암냥 2026-05-17 02:49:11 +09:00
No known key found for this signature in database

View file

@ -11,6 +11,8 @@ jobs:
steps:
- name: Checkout Local Repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # 전체 커밋 히스토리를 가져와 비교 및 머지가 가능하도록 설정
- name: Configure Git
run: |
@ -33,7 +35,8 @@ jobs:
echo "has_changes=true" >> $GITHUB_OUTPUT
git checkout -b $BRANCH_NAME
git merge upstream/dev --no-edit
# --allow-unrelated-histories 플래그를 추가하여 독립된 히스토리 간의 병합을 허용
git merge upstream/dev --no-edit --allow-unrelated-histories
git push origin $BRANCH_NAME
else