resolve-conflicts - Drop feature
#8787
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
fregante
commented
Nov 20, 2025
| <p><img src="https://user-images.githubusercontent.com/1402241/61187598-f9118380-a6a5-11e9-985a-990a7f798805.png"> | ||
| <th width="50%"> | ||
| <p><a title="resolve-conflicts"></a> Adds one-click merge conflict fixers | ||
| <p><img src="https://user-images.githubusercontent.com/1402241/54978791-45906080-4fdc-11e9-8fe1-45374f8ff636.png"> |
Member
Author
There was a problem hiding this comment.
TODO: place another feature here in the highlights
|
Please add labels to this PR |
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.
resolve-conflictsintroduces wrong "Current Change" label #8783resolve-conflictsnow built in #8691This also drops the feature on GHE.
It's relatively easy to add check to see if GitHub is showing the native feature, but it would need testing since the editor is dynamic and the widget might be out of view(/DOM). So probably easier to just drop it.