18

Following an attempted git merge on the commandline, my file now has standard conflict markers in it which emacs has helpfully reloaded (reverted?) in the buffer.

How do I start some kind of merging mode to resolve the conflict? Can I get seperate buffers showing left/right/merged versions of the file like when I ediff-files?

(emacs-prelude v24.4 on a Mac)

Improve this question
1
  • All three of these look good. Thank you! I will make a conflicted file, try each answer, and report back about my experience. Commented Dec 22, 2014 at 1:17

3 Answers 3

Reset to default
18

If you use magit, you can press e at the unmerged file in magit status buffer (started by pressing M-xmagit-statusRET) to start ediff session for resolving the conflicts

Improve this answer
12

You can use the minor mode smerge-mode to move between conflicts and resolve them. You can open ediff to resolve conflicts with C-c ^ E while in smerge mode.

Improve this answer
11

M-x vc-resolve-conflicts RET

I bind it to C-xv<

Improve this answer

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.