Fix for showing button in merge result editor - #21408
Merged
Karthik Nadig (karthiknadig) merged 1 commit intoJun 12, 2023
Merged
Conversation
Karthik Nadig (karthiknadig)
enabled auto-merge (squash)
June 12, 2023 18:19
Karthik Nadig (karthiknadig)
added
the
bug
Karthik Nadig (karthiknadig)
added
the
skip package*.json
roblourens
approved these changes
Jun 12, 2023
Karthik Nadig (karthiknadig)
added a commit
to karthiknadig/vscode-python
that referenced
this pull request
Jun 12, 2023
Karthik Nadig (karthiknadig)
added a commit
that referenced
this pull request
Jun 13, 2023
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.
Closes #21398