From d3bb0630acf7afcdd64c19913c9d6ed00169dc6f Mon Sep 17 00:00:00 2001 From: Cody Rigney Date: Mon, 13 Nov 2023 15:30:35 -0500 Subject: [PATCH] Add user config for automated merge. --- .github/workflows/merge-main-into-small-image.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/merge-main-into-small-image.yml b/.github/workflows/merge-main-into-small-image.yml index 14af9fc..5747336 100644 --- a/.github/workflows/merge-main-into-small-image.yml +++ b/.github/workflows/merge-main-into-small-image.yml @@ -15,6 +15,8 @@ jobs: - uses: actions/checkout@v4 - name: Merge with main run: | + git config user.name github-actions + git config user.email github-actions@github.com git fetch git checkout small-image git merge main --no-ff --no-edit