We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3d33d98 commit 4f42240Copy full SHA for 4f42240
1 file changed
.github/workflows/sync-main-to-dev.yaml
@@ -34,9 +34,11 @@ jobs:
34
git config user.name ${GITHUB_ACTOR}
35
git config user.email "a@b.c"
36
SYNC="$BASE-sync-with-$HEAD"
37
- git fetch origin $HEAD $BASE
38
- git checkout -b $SYNC origin/$BASE
39
- git pull
+
+ git fetch origin -v
+ git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
40
+ git status
41
42
git merge origin/$HEAD
43
git checkout origin/dev src/*
44
git checkout origin/dev tests/*
0 commit comments