search

microsoft / vscode-copilot-release

Feedback on GitHub Copilot Chat UX in Visual Studio Code.
https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat
Creative Commons Attribution 4.0 International
328 stars 31 forks source link

Git merge resolution #1438

Open mattpara opened 2 months ago

mattpara commented 2 months ago

One thing I think we all struggle with consistently on larger teams is merge conflicts. Today I was frustrated with a conflict in a package.json file that is hard to navigate and line up the differences and the normal tools aren't helping. I was hoping for Github Copilot to be able to help with the merge more efficiently and even correct it for me, making sure that the proper library and version numbers needed against both current branch and main are covered, however, it was asking for the specific part of the file rather than being more integrated and have better context of the overall changes in both branches.

It asked "To help you fix the merge issues in your [package.json], I need to see the conflicting sections. Merge conflicts are usually marked with conflict markers like <<<<<<<, =======, and >>>>>>>."

What would be great is that Github Copilot could have better integration with Merge conflicts and git commands so that issues are dealt with better on complex merges or even those within config files that can be very tedious instead of a copy paste each section which does not give it full context of both branches.

hediet commented 2 months ago

Do you have an example of a merge conflict that AI could be expected to solve? Also, did you try the VS Code 3-way merge editor?