Skip to content

Commit 9b723a4

Browse files
committed
Update sync-main-to-dev.yaml
1 parent 015ebe3 commit 9b723a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/sync-main-to-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
git fetch origin -v
3939
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4040
41-
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
41+
git merge origin/$HEAD -m "Merge $HEAD into $SYNC" --allow-unrelated-histories
4242
git checkout origin/dev src/*
4343
git checkout origin/dev tests/*
4444
git commit -m "Restored src/* and tests/*"

0 commit comments

Comments
 (0)