git-mediate

{
  "aliases": [],
  "alternatives": [],
  "build_dependencies": [
    "cabal-install",
    "ghc"
  ],
  "categories": [],
  "caveats": null,
  "conflicts_with": [],
  "dependencies": [
    "gmp"
  ],
  "deprecated": 0,
  "deprecation_reason": null,
  "desc": "Utility to help resolve merge conflicts",
  "disable_reason": null,
  "disabled": 0,
  "enrichment_fetched_at": "2026-06-20T23:38:04+00:00",
  "first_seen": "2026-06-20T23:34:18+00:00",
  "full_name": "git-mediate",
  "github_default_branch": "master",
  "github_last_commit_at": "2026-06-16T20:39:30Z",
  "github_readme_excerpt": "# git-mediate [![Hackage version](https://img.shields.io/hackage/v/git-mediate.svg?label=Hackage)](https://hackage.haskell.org/package/git-mediate) [![homebrew](https://img.shields.io/homebrew/v/git-mediate.svg)](https://formulae.brew.sh/formula/git-mediate)\n\n## Introduction\n\nHandling conflicts is difficult!\n\nOne useful way to handle them, is to use git\u0027s {z,}diff3 conflict style:\n\n```shell\ngit config --global merge.conflictstyle zdiff3\n```\n\nAnd then when you get a conflict, it looks like:\n\n    Unconflicted stuff\n\n    \u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD\n    Version A changes\n    |||||||\n    Base version\n    ======= Version B\n    Version B changes\n    \u003e\u003e\u003e\u003e\u003e\u003e\u003e\n\n    More unconflicted stuff here\n\nThen you are supposed to manually merge the useful changes in the top and bottom parts, relative to the base version.\n\nA useful way to do this is to figure out which of the changes (Version A or Version B) is a simpler change.\n\nPerhaps one of the versions just added a small comment above the code section:\n\n    Unconflicted stuff\n\n    \u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD\n    Added a comment here\n    BASE\n    |||||||\n    BASE\n    ======= Version B\n    BASE and complex changes here\n    \u003e\u003e\u003e\u003e\u003e\u003e\u003e\n\n    More unconflicted stuff here\n\nOne easy thing to do, mechanically, is to apply the simple change to\nthe other 2 versions. Thus, it becomes:\n\n    Unconflicted stuff\n\n    \u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD\n    Added a comment here\n    BASE\n    |||||||\n    Added a comment here\n    BASE\n    ======= Version B\n    Added a comment here\n    BASE and complex changes here\n    \u003e\u003e\u003e\u003e\u003e\u003e\u003e\n\n    More unconflicted stuff here\n\nNow, you can run this little utility: git-mediate, which will see\nthe conflict has become trivial (only one side changed anything) and\nselect that side appropriately.\n\nWhen all conflicts have been resolved in a file, \"git add\" will be\nused on it automatically.\n\n### Simpler case\n\nYou might just resolve the conflicts manually and remove the merge markers from all of the conflicts.\n\nIn such a case, just run git-mediate, and it will \"git add\" the\nfile for",
  "github_repo": "Peaker/git-mediate",
  "github_stars": 194,
  "github_topics": [],
  "homepage": "https://github.com/Peaker/git-mediate",
  "homepage_og_description": null,
  "homepage_og_image": null,
  "homepage_title": null,
  "installs_30d": 2,
  "installs_365d": 54,
  "installs_90d": 4,
  "keg_only": 0,
  "keg_only_reason": null,
  "last_seen": "2026-06-20T23:34:18+00:00",
  "license": "GPL-2.0-only",
  "llm_generated_at": null,
  "llm_model": null,
  "name": "git-mediate",
  "oldnames": [],
  "one_liner": null,
  "optional_dependencies": [],
  "rank_30d": 13491,
  "rank_365d": 10813,
  "rank_90d": 15400,
  "raw_hash": "f1c828fbf45a90a5",
  "recommended_dependencies": [],
  "revision": 0,
  "ruby_source_path": "Formula/g/git-mediate.rb",
  "tap": "homebrew/core",
  "test_dependencies": [],
  "uses_from_macos": [
    "libffi"
  ],
  "version_head": null,
  "version_stable": "1.1.0",
  "versioned_formulae": [],
  "why_use_this": null
}