Repository navigation
Merge Conflict During Pull Request #1562
Description
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.
Activity
slwhitman commentedon Mar 6, 2023
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?
conradwt commentedon Mar 28, 2023
Are there any updates to this issue because this appears to be a regression for a feature that once worked?
erlebach commentedon Jun 6, 2023
Any updates? I wasted hours not realizing there was a bug.
Conrad Taylor (@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!
Allow a PR to be brought up to date with main and resolve conflicts
Allow a PR to be brought up to date with main and resolve conflicts (#…