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

Merge Conflict During Pull Request #1562

Closed
RobelCSUN opened this issue Mar 11, 2020 · 3 comments · Fixed by #5618
Closed

Merge Conflict During Pull Request #1562

RobelCSUN opened this issue Mar 11, 2020 · 3 comments · Fixed by #5618
Assignees
@alexr00
Labels
feature-request Request for new features or functionality on-testplan

Comments

@RobelCSUN
Copy link

RobelCSUN commented Mar 11, 2020 •
edited
Loading

When making a pull request and there is a merge conflict that can not be resolved automatically, vscode-pull-request-github does not allow you to fix the merging conflict within the plugin itself. Currently, we have to go to the GitHub website to resolve the merging conflict occurred during pull request. It would be nice if vscode-pull-request-github has this functionality.
@RMacfarlane RMacfarlane added the feature-request Request for new features or functionality label Aug 14, 2020
@alexr00 alexr00 mentioned this issue Dec 12, 2022
Closed
@slwhitman
Copy link

This is really painful to have to step out of band to use GitHub to resolve conflicts. Any hope to allow users to do this in VSCode Conflict Editor?

@alexr00 alexr00 mentioned this issue Mar 27, 2023
Closed
@conradwt
Copy link

Are there any updates to this issue because this appears to be a regression for a feature that once worked?

@erlebach
Copy link

erlebach commented Jun 6, 2023 •
edited
Loading

Any updates? I wasted hours not realizing there was a bug.
@conradwt: I love your Youtube videos. It would be great if you could create a video that demonstrates a pull request with conflicts from within VSC and how to resolve it. This particular use case is hard to come by. Thanks!

@alexr00 alexr00 self-assigned this Nov 1, 2023
@alexr00 alexr00 added this to the November 2023 milestone Nov 1, 2023
@kieferrm kieferrm mentioned this issue Nov 6, 2023
Closed
55 tasks
@alexr00 alexr00 modified the milestones: November 2023, December 2023 Nov 28, 2023
@alexr00 alexr00 modified the milestones: December 2023, February 2024 Dec 5, 2023
@joaomoreno joaomoreno removed this from the February 2024 milestone Dec 11, 2023
@alexr00 alexr00 added this to the December / January 2024 milestone Dec 11, 2023
@kieferrm kieferrm mentioned this issue Dec 20, 2023
Closed
67 tasks
alexr00 added a commit that referenced this issue Jan 15, 2024
@alexr00
Allow a PR to be brought up to date with main and resolve conflicts
3b291e8 
Fixes #1562, #200
@alexr00 alexr00 mentioned this issue Jan 15, 2024
Merged
alexr00 added a commit that referenced this issue Jan 17, 2024
@alexr00
Allow a PR to be brought up to date with main and resolve conflicts (#…
5fffcbe 
…5618)

* Allow a PR to be brought up to date with main and resolve conflicts
Fixes #1562, #200

* Use viewerCanUpdate instead of viewerCanUpdateBranch

* Refactor notification into separate class

* Use git to check if PR branch is up to date with base

* Clean up

* Move proposal
@alexr00 alexr00 mentioned this issue Jan 22, 2024
Closed
3 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
No milestone
7 participants
@conradwt @joaomoreno @erlebach @RMacfarlane @RobelCSUN @alexr00 @slwhitman