3 ms·

I have basically the same complaint about most of the mergetools I've used; they tend to just do more than I want. I'm sure that's largely a PEBKAC problem, but

I have basically the same complaint about most of the mergetools I've used; they tend to just do more than I want. I'm sure that's largely a PEBKAC problem, but..... ¯\_(ツ)_/¯ Definitely going to take a look at this; you screenshots look promising.

Peaker 9y ago
Have you looked at https://github.com/Peaker/git-mediate 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 while reducing erroneous merges by a lot.