From 4b69d84cb877a47e26a46638afd68bb814562f52 Mon Sep 17 00:00:00 2001 From: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> Date: Sat, 30 Nov 2024 14:57:30 -0500 Subject: [PATCH] signoff for upmerge git commit (#1889) Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> --- .github/workflows/upmerge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index 01676f70..70adacf8 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -65,7 +65,7 @@ jobs: git fetch origin $SOURCE_BRANCH git merge --no-commit origin/$SOURCE_BRANCH git checkout edge -- bicepconfig.json - git commit -m "Upmerge to edge" + git commit --signoff --message "Upmerge to edge" if git diff --quiet edge; then echo "No changes to merge from $SOURCE_BRANCH to edge"