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
We thank the following contributor(s) for this extension: Larry Hu, Tyrie Vella, William Au Yeung, Binyao Jiang, Saravana Kumar Ramachandran
We need your feedback! Here are some of the ways to connect with us:
View Notices for third party software included in this extension.