From 236f5378aae8fde75620e1613d8318666a12f78e Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Thu, 10 Jun 2021 14:30:54 -0700
Subject: [PATCH] Add committer name

---
 .github/workflows/updateProtectedBranch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml
index db6ca2cb2c78..c926f8e44ae9 100644
--- a/.github/workflows/updateProtectedBranch.yml
+++ b/.github/workflows/updateProtectedBranch.yml
@@ -57,6 +57,7 @@ jobs:
       - name: Create temporary branch to resolve conflicts
         if: ${{ contains(fromJSON('["staging", "production"]'), github.event.inputs.TARGET_BRANCH) }}
         run: |
+          git config user.name ${{ github.actor }}
           git checkout ${{ github.event.inputs.TARGET_BRANCH }}
           git checkout -b update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }}
           git merge -Xtheirs ${{ env.SOURCE_BRANCH }}