My recent Git merge has resulted in a large number of conflicts. My current approach is to search for the next occurence of '<<<' and then perform the merge by standard text editing.

**Question**: is there a way Emacs can support merging using the information availabe in Git about my version, their version and the base version of the file?

---

Edit: This question has a different scope than [this related question](https://emacs.stackexchange.com/questions/5507), since it is not limited to invoking ediff.