We need your feedback! Here are some of the ways to connect with us: We thank the following contributor(s) for this extension: Larry Hu, Tyrie Vella, William Au Yeung, Binyao Jiang, Saravana Kumar Ramachandran Feedback Files over 8 MB may not be resolved by merging, only by taking the entire source or target file
Edit files with Monaco, the editor that powers VS Code.Look through the list of files with conflicts and select a file to resolve Quick steps to get started After installing the extension, select the Conflicts tab from within a pull request. 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. Resolve pull request merge conflicts on the webīefore a Git pull request can complete, any conflicts with the target branch must be resolved.
