Overview
MultiMerge helps teams using Team Foundation Version Control (TFVC) bring a work item and its associated changesets to a release branch through a guided workflow.
Select the work item and target branch, review a file-by-file merge plan, resolve conflicts and check in each part. Configure policies to preserve branch-specific package references, assembly versions and other protected content. The original single-changeset merge workflow is also available.
Features
- Find changesets associated with a work item and choose which to include.
- Select multiple changeset rows with Ctrl/Shift and include or exclude them together.
- Apply selection changes with Update plan, avoiding repeated previews after each checkbox change.
- Review dependency warnings and a merge plan before changing the workspace. The warnings window can be resized or minimized while you inspect Visual Studio; the merge waits for explicit confirmation.
- Prefill check-in comments with the original comments of the changesets delivered in each part, including partial check-ins and Pending Changes.
- Split merges into parts when intervening changes require a check-in boundary.
- Resolve text conflicts in a dedicated tab with editable results.
- Configure team and personal merge policies with Merge, Discard and Skip actions.
- Protect selected lines or blocks in matching files.
- Use presets for package references, central package management and assembly versions.
- Review manual follow-ups for source changes excluded by protected-content rules.
- Check pending changes, planned merges and protected content before check-in.
- Continue using the single-changeset merge workflow from Team Explorer.
Getting started
- Open Team Explorer → MultiMerge → Merge From Task.
- Enter the work item and choose the target branch.
- Open the Merge from Task tab, choose the changesets to include, click Update plan and review the plan.
- Configure Merge Policies if needed, start the merge and resolve conflicts.
- Build and test the merged application before confirming each check-in.
- Review the manual follow-ups and update branch-specific packages through your normal process.
Requirements and scope
- Tested on Visual Studio 2026 Professional or Enterprise on Windows (64-bit). The manifest also permits Visual Studio 2022 17.14+, which has not yet been validated by the maintainer.
- A TFVC project and a workspace that maps the target branch.
- One target branch per task merge.
The extension does not build your application or decide which conflict resolution is correct. A work item link does not prove that all code dependencies are included. Task merges stop on unsupported operations such as renames, branching, rollback or undelete. Resuming a merge chain after closing Visual Studio is not currently supported.
The Release build passes 320 automated tests. The maintainer has also exercised the TFVC workflow in their own environment.
Policies and existing settings
Team policies use .automerge-policy.json in the target branch root to preserve compatibility with existing configurations. Personal policies and single-changeset preferences created before the MultiMerge rename are copied on first use if the corresponding MultiMerge settings do not exist.
Open source and attribution
Maintained by Luca Persichini. MultiMerge is an independent fork of AutoMerge by Kulikov Denis (CDuke), distributed under the Apache License 2.0. Original attribution is retained in the source and VSIX.
Source and documentation · Release notes
