2 ms·Emacs magit and smerge mode makes this a breeze.by dpbriggs 5y agoEmacs magit and smerge mode makes this a breeze.