VS Code’s experimental Resolve Merge Conflict with AI action asks GitHub Copilot to propose a resolution for an open conflicted file. It gives the assistant the merge base and both branches’ changes as context, but the result is a suggestion—not an automatic or guaranteed fix. Review the edits, inspect the staged diff, and run relevant tests before continuing the Git operation.
What VS Code’s AI conflict resolver does
When a Git operation leaves conflict markers in a file, choose Resolve Merge Conflict with AI in the editor. VS Code opens Chat and starts an agentic flow. The assistant considers the merge base—the common ancestor of the branches—and the changes from each branch, then proposes an edit intended to preserve the intent of both sides. See Microsoft’s VS Code merge-conflict guide and AI smart actions documentation.
The capability is experimental and requires GitHub Copilot access. Labels and availability may change. The AI proposal still needs a developer to check whether the combined code is correct and behaves as intended.
How to resolve a conflict with AI in VS Code
- Start or continue the Git operation. This may be a merge, rebase, cherry-pick, or stash restoration. Open a conflicted file in VS Code.
- Start the AI flow. Select Resolve Merge Conflict with AI in the editor. VS Code opens Chat and supplies the merge base and changes from both branches as context.
- Review the analysis and edits. Inspect the proposed result in Chat and in the editor. If it misses important context, provide that context or revise the code yourself.
- Save and validate. Save the resolved file, stage the resolution, and inspect the staged diff. Run the relevant tests or checks for the code you changed.
- Continue the operation that stopped. For a merge, finish through Source Control by committing the merge. For a rebase, run
git rebase --continue; for a cherry-pick, rungit cherry-pick --continue. If you restored a stash, inspect the files and commit the changes as appropriate; a stash restoration does not call for a merge commit. - Check the repository state. Run
git statusand confirm Git no longer reports the operation as in progress.
Choose AI, inline actions, or the three-way merge editor
AI is one way to handle a conflict, not the only one. VS Code also provides inline conflict actions and a three-way merge editor. The right choice depends on whether you want to make the decision directly, compare the competing versions visually, or ask Copilot to propose a combined edit.
Recommended Free Tools
#1 Best Overall
- Read Before You Buy — No Video Output: These adapters support charging and USB 2.0 data transfer, but cannot transmit video signals. Except for standard USB webcams (which use USB data only), they are not compatible with HDMI/DisplayPort cables, video-capable USB-C hubs, or docking stations with video output.
- Convert USB-A Ports to USB-C: Designed to connect USB-C earphones, cables, flash drives, card readers, and other USB-C accessories to standard USB-A ports. Plug-and-play with no drivers or software required.
- Aluminum Alloy Housing: Built with a sturdy aluminum alloy shell that aids in heat dissipation and protects against daily wear and scratches. Designed to maintain a stable and secure connection.
- Compact & Travel-Friendly: The ultra-compact design allows the adapter to stay plugged into your device without blocking adjacent ports or adding bulk, reducing wear and tear on your original USB ports.
- 12-Month Warranty: Backed by a 12-month manufacturer warranty for peace of mind. Designed to meet strict quality control standards for reliable everyday performance.
| Option | What you work with | Copilot access | Review and completion |
|---|---|---|---|
| Inline conflict actions | The conflicted file and its inline conflict controls; see the VS Code source-control overview. | Not required for the manual actions. | Choose and edit the content yourself, then inspect, test, stage, and continue the Git operation. |
| Three-way merge editor | A visual comparison of the versions involved in the merge, available through VS Code source control. | Not required to use the manual editor. | Resolve the comparison yourself, then inspect, test, stage, and continue the Git operation. |
| Resolve Merge Conflict with AI | The merge base and each branch’s changes are provided to the assistant as context. | Required; the action is experimental. | Review or revise the proposed edit, then inspect, test, stage, and continue the Git operation. |
Keep the AI action distinct from Agent Merge
The editor action for an open conflicted file is different from Agent Merge, a separate preview workflow associated with pull requests and agent sessions. VS Code 1.136 describes Agent Merge as helping address review feedback, failed checks, and merge conflicts until a pull request is ready to merge. The chat.agentMerge.resolveConflicts setting is listed as experimental in the VS Code 1.136 release notes and AI settings reference.
Customize conflict resolution with AGENTS.md
VS Code’s September 2025 (version 1.105) release notes say an AGENTS.md file can customize AI merge-conflict resolution. This is a way to supply project-specific guidance, not a replacement for reviewing the resulting code. See the VS Code 1.105 release notes.
Quick Recap
Best Value
- 5-in-1 Connectivity: Equipped with a 4K HDMI port, a 5 Gbps USB-C data port, two 5 Gbps USB-A ports, and a USB C 100W PD-IN port. Note: The USB C 100W PD-IN port supports only charging and does not support data transfer devices such as headphones or speakers.
- Powerful Pass-Through Charging: Supports up to 85W pass-through charging so you can power up your laptop while you use the hub. Note: Pass-through charging requires a charger (not included). Note: To achieve full power for iPad, we recommend using a 45W wall charger.
- Transfer Files in Seconds: Move files to and from your laptop at speeds of up to 5 Gbps via the USB-C and USB-A data ports. Note: The USB C 5Gbps Data port does not support video output.
- HD Display: Connect to the HDMI port to stream or mirror content to an external monitor in resolutions of up to 4K@30Hz. Note: The USB-C ports do not support video output.
- What You Get: Anker 332 USB-C Hub (5-in-1), welcome guide, our worry-free 18-month warranty, and friendly customer service.
Rank #4
- Dual Converters, Infinite Potential：Includes 2× USB C male to USB A female adapters and 2× USB A male to USB C female adapters. Perfect for a wide range of uses—tablets with Bluetooth keyboards, expand USB ports on macbook, and more. Two different converters for all your daily needs
- Next-Level 10Gbps & 3A Charging: No more slow 480Mbps, this usb to usb c adapter has a transfer speed of up to 10Gbps, allowing you to do more transferring in less time. This usb adapter fits both USB A and USB C charger, supporting up to 3A fast charging
- Upgraded Exquisite Craftsmanship: With an aluminum alloy housing and metal connector, the usbc to usb adapter is extremely durable and sturdy. Rigorously tested to withstand more than 10,000 times of plugging and unplugging, ensuring long-lasting performance
- Broad Compatible: The usb c to usb adapter widely supports all USB C/ USB A devices like laptops, tablets, cellphones, car chargers, and phone chargers. Such as compatible with MacBook Pro/Air 2023/2022, Thunderbolt 4/3 Devices,Apple MagSafe Watch 9/8/7/SE/Ultra, iPad Pro 2022/2021, Samsung Galaxy S23/S20/S10, and iPhone 17/16/15 Pro. Plug and play
- Please Note: To reach 10Gbps speed, keep the cable under 3.3 ft. For USB A Male to USB C adapters, try flipping the USB C connector. USB C Male to USB A adapters support bidirectional 10Gbps transfer within 3.3 ft
Rank #3
- Sleek 7-in-1 USB-C Hub: Features an HDMI port, two USB-A 3.0 ports, and a USB-C data port, each providing 5Gbps transfer speeds. It also includes a USB-C PD input port for charging up to 100W and dual SD and TF card slots, all in a compact design.
- Flawless 4K@60Hz Video with HDMI: Delivers exceptional clarity and smoothness with its 4K@60Hz HDMI port, making it ideal for high-definition presentations and entertainment. (Note: Only the HDMI port supports video projection; the USB-C port is for data transfer only.)
- Double Up on Efficiency: The two USB-A 3.0 ports and a USB-C port support a fast 5Gbps data rate, significantly boosting your transfer speeds and improving productivity.
- Fast and Reliable 85W Charging: Offers high-capacity, speedy charging for laptops up to 85W, so you spend less time tethered to an outlet and more time being productive.
- What You Get: Anker USB-C Hub (7-in-1), welcome guide, 18-month warranty, and our friendly customer service.
Rank #2
- 5-in-1 USB-C Hub: Experience comprehensive connectivity featuring a Power Delivery input, two USB-A 2.0 ports, a USB-A 3.0 port, and an HDMI port. (Note: The USB-C power delivery input port is only for connecting an external wall charger to power your laptop and cannot power peripheral devices.)
- 90W Pass-Through Charging: Achieve optimal charging with 90W pass-through power to your laptop, supported by a total input of 100W, with the hub reserving 10W for operational efficiency. (Note: Wall charger not included.)
- Quick Data Transfers: Accelerate your productivity with rapid data transfers using a high-speed 5Gbps USB 3.0 port and two 480Mbps USB 2.0 ports.
- 4K HDMI Display: Enhance your visual experience with a hub capable of delivering 4K resolution at 30Hz in both mirror and extend modes. Please note that this hub is compatible with MacBook (macOS 12 and newer), Windows 10 and 11, ChromeOS, and laptops equipped with DP Alt Mode and Power Delivery. Note: This device is not compatible with Linux.
- What You Get: Anker USB-C Hub (5-in-1, 4K HDMI), welcome guide, 18-month warranty, and our friendly customer service.
Product prices and availability are accurate as of the date/time indicated and are subject to change. Any price and availability information displayed on Amazon at the time of purchase will apply.
