We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b37f5eb commit 3f62aacCopy full SHA for 3f62aac
.github/workflows/sync-main-to-dev.yaml
@@ -39,7 +39,7 @@ jobs:
39
SYNC="$BASE-sync-with-$HEAD"
40
41
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
+ git merge origin/$HEAD -m "Merge $HEAD into $SYNC" # --allow-unrelated-histories
43
git checkout origin/dev src/*
44
git checkout origin/dev tests/*
45
git commit -m "Restored src/* and tests/*" || echo ""
0 commit comments