git-mediate: Tool to help resolving git conflicts

[ development, gpl, program ] [ Propose Tags ]

Git conflict resolution has never been easier

When encountering a conflict, you can sometimes imagine: if only I could have applied one of these patches BEFORE the other rather than concurrently, I wouldn't be in this mess!

Well, with git-mediate, you can!

In any conflicted state - git-mediate shows you the 2 diffs involved. By applying these diffs to the base version and the other version, you emulate the situation where the patch had already existed when the other had been applied.

Reapply git-mediate, it will validate that you've indeed applied it correctly, and bam: conflict disappeared!

Git-mediate also lets you handle modify/delete conflicts (there's no sane way in git to show what the modification actually was)

Git-mediate also streamlines jumping to the conflicts with your editor, either with the -e option to invoke your editor, or via the standard line number format, which is parsed by all major editors, to allow use of "jump to next error" keys.

Git-mediate especially shines with automatic source transformation tools such as renamers.

In a conflicted state, re-apply a rename that caused the conflict, run git-mediate without opening any files, and the conflicts are gone!

Versions 1.0, 1.0.1, 1.0.2, 1.0.3, 1.0.4, 1.0.5 (info)
Dependencies ansi-terminal (>=0.6.2), base (>=4.8 && <5), base-compat (>=0.8.2 && <0.11), Diff (>=0.3), directory (>=1.2), filepath (>=1.3), mtl (>=2.1), optparse-applicative (>=0.11 && <0.15), process (>=1.2), unix-compat (>=0.4.2.0) [details]
License GPL-2.0-only
Author Eyal Lotem
Maintainer eyal.lotem@gmail.com
Category Development
Home page https://github.com/Peaker/git-mediate
Source repo head: git clone https://github.com/Peaker/git-mediate
Uploaded by EyalLotem at Tue Jul 24 22:17:34 UTC 2018
Distributions NixOS:1.0.5
Executables git-mediate
Downloads 1150 total (26 in the last 30 days)
Rating 2.0 (votes: 1) [estimated by rule of succession]
Your Rating
  • λ
  • λ
  • λ
Status Docs not available [build log]
Last success reported on 2018-07-24 [all 2 reports]
Hackage Matrix CI

Downloads

Maintainer's Corner

For package maintainers and hackage trustees