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 "

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.