Peaker/git-mediate
View on GitHub ↗ ★ 195 Haskell
Become a conflict resolution hero
4 mentions on Hacker News by 3 people: 2 stories, 2 comments · first 2018-01-02 · latest 2023-07-16
20082026
-
▲ 3
git-mediate – become a Git conflict resolution herostory by pabs3 · 2023-07-16 · 0 comments
-
▲ 2
git-mediate – become a conflict resolution herostory by pabs3 · 2023-07-03 · 0 comments
-
https://github.com/Peaker/git-mediate is an amazing secret weapon for making quick work of 3-way conflict resolution.
comment by danra · 2023-01-29 · in Merging with diff3: the “three-way merge” -
Have you looked at https://github.com/Peaker/git-mediate ? Everyone I talked into using it had always initially thought "meh" but later thanked me - claiming it's a huge life-saver :) It makes solving conflicts into a fun mechanical game…
comment by Peaker · 2018-01-02 · in Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts