diff --git a/.forgejo/workflows/main.yml b/.forgejo/workflows/main.yml index 6ffc8cd..4d89792 100644 --- a/.forgejo/workflows/main.yml +++ b/.forgejo/workflows/main.yml @@ -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