Small, reliable tools for Azure DevOps teams
Built and maintained by an independent developer who uses Azure DevOps every day.
Merge Conflict Resolver
Resolve pull request merge conflicts in the browser with a 3-way editor that never loses your work, keeps your file encoding intact, and can commit the resolution to the source branch.
Learn more