Skip to content

Completing merge didn't do anything #5953

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.

Sign up for GitHub

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

Jump to bottom
Closed
Tyriar opened this issue Apr 23, 2024 · 1 comment
Closed

Completing merge didn't do anything #5953

Tyriar opened this issue Apr 23, 2024 · 1 comment
Assignees
@alexr00
Labels
bug Issue identified by VS Code Team member as probable bug *duplicate Issue identified as a duplicate of another issue(s)

Comments

@Tyriar
Copy link
Member

Tyriar commented Apr 23, 2024

Testing #5939

Repro:

🐛 nothing seemed to happen, no merge happened, resolve conflicts button remains disabled.

image
@Tyriar Tyriar mentioned this issue Apr 23, 2024
Closed
4 tasks
@alexr00 alexr00 added the bug Issue identified by VS Code Team member as probable bug label Apr 24, 2024
@alexr00 alexr00 added this to the April 2024 milestone Apr 24, 2024
@alexr00
Copy link
Member

alexr00 commented Apr 24, 2024

Same cause as #5952

@alexr00 alexr00 closed this as completed Apr 24, 2024
@alexr00 alexr00 added the *duplicate Issue identified as a duplicate of another issue(s) label Apr 24, 2024
@alexr00 alexr00 removed this from the April 2024 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@alexr00 alexr00

Labels
bug Issue identified by VS Code Team member as probable bug *duplicate Issue identified as a duplicate of another issue(s)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Tyriar @alexr00