unwrap-unnecessary-dropdowns - Support "Resolve conflicts"#9367
Merged
Conversation
update-pr-from-base-branch - Replace native button
update-pr-from-base-branch - Replace native buttonunwrap-unnecessary-dropdowns - Support "Resolve conflicts"
fb14bbe to
8315ec0
Compare
fregante
reviewed
May 7, 2026
SunsetTechuila
commented
May 7, 2026
|
|
||
| function insertCopilotInstruction(): void { | ||
| const textarea = $(prCommentField); | ||
| setFieldText(textarea, '@copilot resolve the merge conflicts in this pull request'); |
Member
Author
There was a problem hiding this comment.
The native button just erases the history btw
Member
Author
There was a problem hiding this comment.
Too bad if you clicked it out of curiosity after writing a comment
Member
Author
|
Screenshot needs to be updated 😒 |
Member
Author
|
I'll do that in #9368 |
SunsetTechuila
commented
May 7, 2026
SunsetTechuila
commented
May 7, 2026
SunsetTechuila
commented
May 7, 2026
Comment on lines
+64
to
+74
| <a | ||
| className="Button--secondary Button--medium Button" | ||
| href={`${location.pathname}/conflicts`} | ||
| type="button" | ||
| > | ||
| <span className="Button-content"> | ||
| <span className="Button-label"> | ||
| Resolve conflicts | ||
| </span> | ||
| </span> | ||
| </a> |
Member
Author
There was a problem hiding this comment.
I will create a createButton helper in a separate PR
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
Co-authored-by: SunsetTechuila <115353812+SunsetTechuila@users.noreply.github.com>
Member
Author
|
The button is automatically removed once the conflict is resolved, nice |
This comment was marked as low quality.
This comment was marked as low quality.
Member
|
Looks fantastic 😍 
|
1 task
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
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.
Resolves #9208
Test URLs
refined-github/sandbox#82
Screenshot