NO-JIRA: Handle files deleted in upstream during merge conflict resolution#122
Draft
slashpai wants to merge 2 commits intorhobs:mainfrom
Draft
NO-JIRA: Handle files deleted in upstream during merge conflict resolution#122slashpai wants to merge 2 commits intorhobs:mainfrom
slashpai wants to merge 2 commits intorhobs:mainfrom
Conversation
slashpai
changed the title
Signed-off-by: Jayapriya Pai <janantha@redhat.com>
…ution 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 <janantha@redhat.com>
slashpai
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix https://github.com/rhobs/syncbot/actions/runs/22424748263/job/64930307860#step:12:11