uplift: display commands required to resolve merge conflicts (Bug 2004186)#746
Closed
cgsheeh wants to merge 1 commit intomozilla-conduit:mainfrom
Closed
uplift: display commands required to resolve merge conflicts (Bug 2004186)#746cgsheeh wants to merge 1 commit intomozilla-conduit:mainfrom
cgsheeh wants to merge 1 commit intomozilla-conduit:mainfrom
Conversation
…4186) Add a dropdown to display commands for the user to run to manually resolve merge conflicts and submit their uplift.
|
View this pull request in Lando to land it once approved. |
shtrom
approved these changes
Dec 5, 2025
Member
shtrom
left a comment
shtrom
left a comment
There was a problem hiding this comment.
LGTM but a few nits/questions.
|
Pull request closed by commit b6d73cb |
lando-prod-mozilla bot
pushed a commit
that referenced
this pull request
Dec 5, 2025
…4186) Add a dropdown to display commands for the user to run to manually resolve merge conflicts and submit their uplift. Pull request: #746
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
2 participants
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.
Add a dropdown to display commands for the user to run to manually
resolve merge conflicts and submit their uplift.