git-mediate ☆

« Back to VersTracker

Description:
Utility to help resolve merge conflicts

Type: Formula | Tracked Since: Dec 28, 2025

Links: Homepage | formulae.brew.sh

Category: Developer tools

Tags: git merge conflict-resolution developer-tools productivity

Install: brew install git-mediate

About:
Git-mediate is a command-line utility designed to streamline the process of resolving Git merge conflicts. It automatically opens all conflicted files in your preferred editor, allowing you to resolve them in parallel rather than sequentially. This tool significantly speeds up conflict resolution by handling the tedious file management and providing a cleaner workflow.

Key Features:

Opens all conflicted files simultaneously in your editor
Automatically cleans up conflict markers after resolution
Integrates seamlessly with existing Git workflow
Reduces manual steps in conflict resolution

Use Cases:

Resolving complex merge conflicts with multiple files
Streamlining daily Git workflow for development teams
Reducing time spent on merge conflict resolution

Alternatives:

git-imerge – Performs incremental merges but is more complex to use
Manual resolution – Native Git requires opening files one by one

Version History

Detected	Version	Rev	Change	Commit
Sep 13, 2025 9:58am		0	VERSION_BUMP	70f2c8a5
Oct 22, 2024 10:20pm		0	VERSION_BUMP	6f5f9758