From 169908a1a4642a23b320582e492e9ec867ae71fa Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Wed, 6 Jan 2021 20:25:02 +0400 Subject: [PATCH] meta: add merge action --- .github/workflows/merge.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 84c94ddc0..282153d55 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -2,7 +2,7 @@ name: merge on: push: branches: - - 'jt/merge-workflow' + - 'master' jobs: merge-to-next-js: runs-on: ubuntu-latest @@ -12,7 +12,6 @@ jobs: - uses: devmasx/merge-branch@v1.3.1 with: type: now - from_branch: jt/test-merge-workflow - target_branch: jt/merge-workflow + target_branch: release/next-js github_token: ${{ github.token }}