Leonardo Etcheverry has an excellent short post on how to resolve merge conflicts with Magit and ediff. For various reasons, I don’t often encounter merge conflicts so I always struggle with getting them resolved. Etcheverry’s post shows how easy this is using Magit and Ediff.
You get three buffers. One for each of the conflicting files and the third for the merge. You can use 【n】 and 【p】 to move between conflicts and then 【a】 or 【b】 to choose the change. Read the post for the details. The whole process looks easy enough that even the occasional user should be able to remember it.