From 048fcd4bee4e2d46569df8e516103df92fdb2b05 Mon Sep 17 00:00:00 2001 From: banrieen Date: Mon, 28 Sep 2020 15:51:36 +0800 Subject: [PATCH] clean merge commit --- .github/workflows/sync_public_when_pushed.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/sync_public_when_pushed.yml b/.github/workflows/sync_public_when_pushed.yml index 7e19335a4..df340dc98 100644 --- a/.github/workflows/sync_public_when_pushed.yml +++ b/.github/workflows/sync_public_when_pushed.yml @@ -22,17 +22,12 @@ jobs: steps: - name: update repo run: | - cd .. git clone -b to_public https://banrieen:18209188642git@github.com/apulis/DLWorkspace.git cd DLWorkspace git config --global user.email "banrieen@173.com" git config --global user.name "banrieen" - git pull git merge origin/develop -X theirs --no-ff - ls -la git push origin to_public - cd .. - rm -rf DLWorkspace sync-repo: runs-on: ubuntu-latest steps: