fix: resolve merge conflicts in backport #50
Merged
Conversation
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
Signed-off-by: matttrach <matt.trachier@suse.com>
matttrach
added a commit
that referenced
this pull request
Aug 20, 2025
* fix: add release secrets from vault (#2) * fix: move release please to release branches (#4) * fix: move release please to release branches * fix: use one file and get vault secrets * fix: abstract OS file functions (#6) * fix: add automation to generate sub issues (#7) * fix: use new path to attach sub issue (#9) * fix: use the API endpoint to attach the sub issue (#11) * fix: add console line to see context (#13) * fix: use the full payload issue (#15) * fix: use a different context (#16) * fix: use the proper variable name (#18) * fix: create issue when a pull request hits main (#20) * fix: give issue write permissions (#21) * fix: give issue write permissions * fix: try pull request target * fix: update pull request template (#22) * fix: assign users to main pr (#25) * fix: add back port pr (#27) * fix: bump dependency from 8 to 27 in tools (#29) * fix: remove try (#31) * fix: use rest request to get sub issues (#33) * fix: use new search API and handle empty label (#34) * fix: remove backport info from pr template (#35) * fix: create a new array to save labels (#36) * fix: use API directly to query issues (#37) * fix: add console log to check context (#38) * fix: remove console log and change count property (#39) * fix: add team members individually to issue (#40) * fix: remove console line (#41) * fix: remove console line * fix: assign to me * fix: add console line converting object to string (#42) * fix: remove unnecessary data (#45) * fix: correct sub issue address (#47) * fix: resolve merge conflicts in backport (#50) * fix: rephrase cherry pick workflow Signed-off-by: matttrach <matt.trachier@suse.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.
Related Issue
Addresses #5 (main issue)
Releases
none
Description
This will automatically resolve conflicts in backport PRs using the
-X theirsstrategy.It adds risk to backport PRs, but allows the PRs to be created without fail.
In most cases this will be ok, but in the few instances where backports have merge conflicts we will ata least be able to see the problems in the review.
We will need to be extra careful to make sure that backports don't remove important lines of code.
Testing
actionlint