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

Offer "resolve conflicts" even when the PR is not checked out #5802

Closed
alexr00 opened this issue Mar 4, 2024 · 0 comments · Fixed by #5858
Closed

Offer "resolve conflicts" even when the PR is not checked out #5802

alexr00 opened this issue Mar 4, 2024 · 0 comments · Fixed by #5858
Assignees
@alexr00
Labels
feature-request Request for new features or functionality on-testplan
Milestone
April 2024

Comments

@alexr00
Copy link
Member

alexr00 commented Mar 4, 2024

We show "resolve conflicts" button on the PR description when the PR is checked out and there are conflicts, but there's no option do resolve conflicts when the PR is not checked out. This also applies to vscode.dev, where we don't have the git extension's merge API.
@alexr00 alexr00 added the feature-request Request for new features or functionality label Mar 4, 2024
@alexr00 alexr00 added this to the March 2024 milestone Mar 4, 2024
@alexr00 alexr00 self-assigned this Mar 4, 2024
@alexr00 alexr00 mentioned this issue Mar 4, 2024
Merged
@kieferrm kieferrm mentioned this issue Mar 4, 2024
Closed
64 tasks
alexr00 added a commit that referenced this issue Mar 15, 2024
@alexr00
Enable updating branch for non-checkout PRs
152a8a8 
and for vscode.dev
Part of #5802
@alexr00 alexr00 mentioned this issue Mar 15, 2024
Merged
alexr00 added a commit that referenced this issue Mar 15, 2024
@alexr00
Enable updating branch for non-checkout PRs (#5836)
9cd8816 
and for vscode.dev
Part of #5802
alexr00 added a commit that referenced this issue Mar 19, 2024
@alexr00
Handle deleted files and preserve mode
45bde5d 
also use file sha instead of contents where possible (perf)
Part of #5802
@alexr00 alexr00 mentioned this issue Mar 19, 2024
Merged
alexr00 added a commit that referenced this issue Mar 19, 2024
@alexr00
Handle deleted files and preserve mode (#5845)
96f1487 
also use file sha instead of contents where possible (perf)
Part of #5802
alexr00 added a commit that referenced this issue Mar 22, 2024
@alexr00
Allow conflicts to be resolved on a non-checked-out PR
63431a2 
Fixes #5802
@alexr00 alexr00 mentioned this issue Mar 22, 2024
Merged
@alexr00 alexr00 modified the milestones: March 2024, April 2024 Mar 22, 2024
alexr00 added a commit that referenced this issue Apr 5, 2024
@alexr00
Allow conflicts to be resolved on a non-checked-out PR (#5858)
bb0a2fb 
* Allow conflicts to be resolved on a non-checked-out PR
Fixes #5802

* Fix incorrect use of previous file name in conflict resolution

* Fix more rename handling

* loc fix
@kieferrm kieferrm mentioned this issue Apr 7, 2024
Closed
53 tasks
@alexr00 alexr00 mentioned this issue Apr 22, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@alexr00 alexr00

Labels
feature-request Request for new features or functionality on-testplan
Projects
None yet
Milestone
April 2024
Development

Successfully merging a pull request may close this issue.

Allow conflicts to be resolved on a non-checked-out PR microsoft/vscode-pull-request-github
1 participant
@alexr00