Skip to content

NO-JIRA: Handle files deleted in upstream during merge conflict resolution #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slashpai wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

NO-JIRA: Handle files deleted in upstream during merge conflict resolution #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce787d
NO-JIRA: Update alertmanager restore-upstream list
slashpai Feb 26, 2026
6da2119
NO-JIRA: Handle files deleted in upstream during merge conflict resol…
slashpai Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/merge-alertmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
CHANGELOG.md
VERSION
.promu.yml
.gitignore
go.mod
go.sum
assets-cmd: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/merge-flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
Loading