Try fix

PennyLaneAI · Oct 25, 2024 · b08e856 · b08e856
1 parent 3c073b1
commit b08e856
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/.github/workflows/update-dev.yml b/.github/workflows/update-dev.yml
@@ -41,16 +41,15 @@ jobs:
           # https://github.com/robotology/gh-action-nightly-merge/blob/master/entrypoint.sh
 
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          git remote set-url origin https://x-access-token:[email protected]/$GITHUB_REPOSITORY
+          git remote set-url origin https://x-access-token:${!PUSH_TOKEN}@github.com/$GITHUB_REPOSITORY.git
           git config --global user.name "$CONFIG_USERNAME"
           git config --global user.email "$CONFIG_EMAIL"
 
           git fetch origin $MERGE_HEAD
-          git checkout $MERGE_HEAD || git checkout -b $MERGE_HEAD origin/$MERGE_HEAD
+          (git checkout $MERGE_HEAD && git pull)
 
           git fetch origin $MERGE_BASE
-          git checkout $MERGE_BASE || git checkout -b $MERGE_BASE origin/$MERGE_BASE
+          (git checkout $MERGE_HEAD && git pull)
 
           git merge $MERGE_ARGS $MERGE_HEAD
-          # git push origin $MERGE_BASE
-          git push
+          git push origin $MERGE_BASE