Skip to content

Commit 3f62aac

Browse files
authored
Remove --allow-unrelated-histories from merge command
1 parent b37f5eb commit 3f62aac

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
@@ -39,7 +39,7 @@ jobs:
3939
SYNC="$BASE-sync-with-$HEAD"
4040
4141
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
42-
git merge origin/$HEAD -m "Merge $HEAD into $SYNC" --allow-unrelated-histories
42+
git merge origin/$HEAD -m "Merge $HEAD into $SYNC" # --allow-unrelated-histories
4343
git checkout origin/dev src/*
4444
git checkout origin/dev tests/*
4545
git commit -m "Restored src/* and tests/*" || echo ""

0 commit comments

Comments
 (0)