Once I learned to use Ediff with Magit there was no going back. It has been consistently the quickest and easiest thing for solving complicated merges of many files in a rebase.