From 09d95c2836ba7fbb593e56ad077840cafa97410c Mon Sep 17 00:00:00 2001 From: Zach Panzarino Date: Thu, 8 Oct 2020 15:55:36 -0400 Subject: [PATCH] fix: set correct committer for gh action merge commit (#8774) --- .github/workflows/merge-master-into-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-master-into-develop.yml b/.github/workflows/merge-master-into-develop.yml index 61a837d9f4..0f833a762d 100644 --- a/.github/workflows/merge-master-into-develop.yml +++ b/.github/workflows/merge-master-into-develop.yml @@ -12,12 +12,12 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.DEVELOP_PUSH_TOKEN }} - - name: Checkout develop branch - run: git checkout develop - name: Set committer info run: | git config --local user.email "$(git log --format='%ae' HEAD^!)" git config --local user.name "$(git log --format='%an' HEAD^!)" + - name: Checkout develop branch + run: git checkout develop - name: Check for merge conflict id: check-conflict run: echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD master) master HEAD | egrep '<<')"