From 2ce787d58b2bf962604f93d82f0c3647357f3b2e Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Thu, 26 Feb 2026 09:23:14 +0530 Subject: [PATCH 1/2] NO-JIRA: Update alertmanager restore-upstream list Signed-off-by: Jayapriya Pai --- .github/workflows/merge-alertmanager.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-alertmanager.yaml b/.github/workflows/merge-alertmanager.yaml index 4741362..f20b4f6 100644 --- a/.github/workflows/merge-alertmanager.yaml +++ b/.github/workflows/merge-alertmanager.yaml @@ -24,6 +24,7 @@ jobs: CHANGELOG.md VERSION .promu.yml + .gitignore go.mod go.sum assets-cmd: | From 6da21190708e24bcb20a6ad08ec4b96e5d698ee7 Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Thu, 26 Feb 2026 09:17:36 +0530 Subject: [PATCH 2/2] NO-JIRA: Handle files deleted in upstream during merge conflict resolution Add a dedicated step to remove all files with UD conflict status (deleted in upstream, present in downstream) before the restore-upstream step runs, so git checkout --theirs works without errors regardless of whether the file is listed in restore-upstream or not. Signed-off-by: Jayapriya Pai --- .github/workflows/merge-flow.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/merge-flow.yaml b/.github/workflows/merge-flow.yaml index 920dd93..f052ee2 100644 --- a/.github/workflows/merge-flow.yaml +++ b/.github/workflows/merge-flow.yaml @@ -138,6 +138,11 @@ jobs: id: merge run: | git merge refs/tags/${{ steps.upstream.outputs.release }} --no-edit || echo 'MERGE_CONFLICT=true' >> $GITHUB_OUTPUT + - name: Resolve conflict due to deleted upstream files + if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }} + run: | + # Remove all files deleted in upstream (UD) before restoring other conflicts + git status --porcelain | awk '{ if ($1=="UD") print $2 }' | xargs -r git rm - name: Resolve conflict using upstream contents if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}} run: |