Skip to content

Commit

Permalink
Merge pull request #3529 from Expensify/Rory-AddCommiterName
Browse files Browse the repository at this point in the history
Add committer name
  • Loading branch information
Jag96 authored Jun 10, 2021
2 parents a38fe91 + 236f537 commit b2f30c6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/updateProtectedBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit b2f30c6

Please sign in to comment.