fix upmerge

Signed-off-by: sk593 <[email protected]>
radius-project · Oct 23, 2024 · b55dbce · b55dbce
1 parent 34deb57
commit b55dbce
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
@@ -62,7 +62,9 @@ jobs:
           export SOURCE_BRANCH=$(basename ${{ github.ref }})
           echo "Upmerging samples from $SOURCE_BRANCH to edge"
           git fetch origin $SOURCE_BRANCH
-          git merge -m "Upmerge to edge" origin/$SOURCE_BRANCH
+          git merge --no-commit origin/$SOURCE_BRANCH
+          git checkout edge -- bicepconfig.json
+          git commit -m "Upmerge to edge"
           
           if git diff --quiet edge; then
               echo "No changes to merge from $SOURCE_BRANCH to edge"