We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 015ebe3 commit 9b723a4Copy full SHA for 9b723a4
.github/workflows/sync-main-to-dev.yaml
@@ -38,7 +38,7 @@ jobs:
38
git fetch origin -v
39
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
40
41
- git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
+ git merge origin/$HEAD -m "Merge $HEAD into $SYNC" --allow-unrelated-histories
42
git checkout origin/dev src/*
43
git checkout origin/dev tests/*
44
git commit -m "Restored src/* and tests/*"
0 commit comments