Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for showing button in merge result editor #21408

Merged
merged 1 commit into from
Jun 12, 2023

Conversation

karthiknadig
Copy link
Member

Closes #21398

@karthiknadig karthiknadig enabled auto-merge (squash) June 12, 2023 18:19
@karthiknadig karthiknadig self-assigned this Jun 12, 2023
@karthiknadig karthiknadig added the bug Issue identified by VS Code Team member as probable bug label Jun 12, 2023
@karthiknadig karthiknadig added this to the May 2023 Recovery 1 milestone Jun 12, 2023
@karthiknadig karthiknadig added the skip package*.json package.json and package-lock.json don't both need updating label Jun 12, 2023
@karthiknadig karthiknadig merged commit a9d5cff into microsoft:main Jun 12, 2023
@karthiknadig karthiknadig deleted the button-bug1 branch June 12, 2023 18:32
karthiknadig added a commit to karthiknadig/vscode-python that referenced this pull request Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issue identified by VS Code Team member as probable bug skip package*.json package.json and package-lock.json don't both need updating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using merge editor for requirements.txt files
2 participants