i have low inteligence
This commit is contained in:
parent
f6c69ba310
commit
6001990b48
1 changed files with 4 additions and 1 deletions
|
|
@ -11,6 +11,8 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Local Repository
|
- name: Checkout Local Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0 # 전체 커밋 히스토리를 가져와 비교 및 머지가 가능하도록 설정
|
||||||
|
|
||||||
- name: Configure Git
|
- name: Configure Git
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -33,7 +35,8 @@ jobs:
|
||||||
echo "has_changes=true" >> $GITHUB_OUTPUT
|
echo "has_changes=true" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
git checkout -b $BRANCH_NAME
|
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
|
git push origin $BRANCH_NAME
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue