Review and resolve pull request merge conflicts on the web
Resolve pull request merge conflicts on the web
Before a Git pull request can complete, any conflicts with the target branch must be resolved. With this extension, you can resolve these conflicts on the web, as part of the pull request merge, instead of performing the merge and resolving conflicts in a local clone.
Quick steps to get started
After installing the extension, select the Conflicts tab from within a pull request.
Look through the list of files with conflicts and select a file to resolve
Select a resolution type for that file
Navigate to the conflicted section
Edit the file to manually merge
Submit the merged file
Edit files with Monaco, the editor that powers VS Code
Filter conflicts by path, name, file type, resolution state, and more
Compare common image formats visually
Resolve UTF-16 and several other encodings not supported by git.exe
Large files can have poor performance. Files over 8 MB may not be resolved by merging, only by taking the entire source or target file
Only files that have detected conflicts can be edited
Directory/File conflicts are not supported
Updates to conflicted files are not shown in the "Files" tab
May not work on older versions of TFS 2017
A project with Git version control
We thank the following contributor(s) for this extension: Larry Hu, Tyrie Vella, William Au Yeung
We need your feedback! Here are some of the ways to connect with us:
View Notices for third party software included in this extension.
Microsoft DevLabs is an outlet for experiments from Microsoft, experiments that represent some of the latest ideas around developer tools. Solutions in this category are designed for broad usage, and you are encouraged to use and provide feedback on them; however, these extensions are not supported nor are any commitments made as to their longevity.