How to start ediff-ing a file that has git conflict markers in it?

Question

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)

All three of these look good. Thank you! I will make a conflicted file, try each answer, and report back about my experience. — daiboo, Dec 22 '14 at 01:17

score 17 · Answer 1 · answered Dec 18 '14 at 05:01

17

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

answered Dec 18 '14 at 05:01

Iqbal Ansari

7,468
1
28
31

score 12 · Answer 2 · edited Jun 30 '21 at 15:28

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.

edited Jun 30 '21 at 15:28

Drew

75,699
9
109
225

answered Dec 19 '14 at 12:17

Joakim Hårsman

719
5
11

score 11 · Answer 3 · answered Dec 18 '14 at 03:12

11

M-x vc-resolve-conflicts RET

I bind it to C-xv<

answered Dec 18 '14 at 03:12

phils

48,657
3
76
115

How to start ediff-ing a file that has git conflict markers in it?

3 Answers3

Linked