Skip to content

Commit 4f42240

Browse files
committed
Update sync-main-to-dev.yaml
1 parent 3d33d98 commit 4f42240

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ jobs:
3434
git config user.name ${GITHUB_ACTOR}
3535
git config user.email "a@b.c"
3636
SYNC="$BASE-sync-with-$HEAD"
37-
git fetch origin $HEAD $BASE
38-
git checkout -b $SYNC origin/$BASE
39-
git pull
37+
38+
git fetch origin -v
39+
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
40+
git status
41+
4042
git merge origin/$HEAD
4143
git checkout origin/dev src/*
4244
git checkout origin/dev tests/*

0 commit comments

Comments
 (0)