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.

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

Complete merge action is undoing the merge #5656

Closed
sandy081 opened this issue Jan 23, 2024 · 1 comment · Fixed by #5675
Closed

Complete merge action is undoing the merge #5656

sandy081 opened this issue Jan 23, 2024 · 1 comment · Fixed by #5675
Assignees
@alexr00
Labels
bug Issue identified by VS Code Team member as probable bug verified Verification succeeded

Comments

@sandy081
Copy link
Member

Testing #5648

  • Open a PR that has merge conflicts
  • Use Resolve Conflicts action
  • Resolve the conflicts in the merge editor and Press Complete Merge action

🐛 Merge is aborted

If it helps, this is the PR I am using here - sandy081/settings-picker#2
@alexr00 alexr00 added the info-needed Issue requires more information from poster label Jan 23, 2024
@alexr00 alexr00 added this to the December / January 2024 milestone Jan 23, 2024
@alexr00
Copy link
Member

alexr00 commented Jan 23, 2024

I can't repro this. I tried with both my own PR and the PR linked in the issue. Can you share the git extension logs?

@alexr00 alexr00 added bug Issue identified by VS Code Team member as probable bug and removed info-needed Issue requires more information from poster labels Jan 24, 2024
alexr00 added a commit that referenced this issue Jan 24, 2024
@alexr00
Complete merge action is undoing the merge
8c80d3e 
Fixes #5656
@alexr00 alexr00 mentioned this issue Jan 24, 2024
Merged
alexr00 added a commit that referenced this issue Jan 24, 2024
@alexr00
Complete merge action is undoing the merge (#5675)
6e2b767 
Fixes #5656
@bhavyaus bhavyaus added the verified Verification succeeded label Jan 25, 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 verified Verification succeeded
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Complete merge action is undoing the merge microsoft/vscode-pull-request-github
3 participants
@sandy081 @bhavyaus @alexr00