Jump to next merge conflict in project using Magit and Smerge

Question

When I am resolving merge conflicts with Magit and Smerge, is there a way for me to cycle through all merge conflicts in the project? Currently I can only move through them one file at a time.

I wrote something like this as as utility but it's not great:

(defun jump-to-first-merge-conflict ()
  (interactive)
  (magit-status)
  (beginning-of-buffer)
  (magit-section-forward-sibling)
  (magit-section-forward-sibling)
  (magit-section-forward)
  (execute-kbd-macro (kbd "<return>")))

It would be nice if I could just use smerge in a project context, instead of a file context.

Answer 1

Just 7 hours ago to Smerge was added a new command to do exactly that. Now you can use M-x smerge-vc-next-conflict to either jump to the next conflict in focused buffer or to the next conflicted file in the repository that the file belongs to.

Don't forget to use (require 'smerge-mode) for this function to appear.

---

For those who can't for some reason upgrade Emacs, I can share an analogous function next-conflict I've been using:

(require 'vc)

(defun smerge-next-safe ()
  "Return t on success, nil otherwise"
  (ignore-errors (not (smerge-next))))

(defun next-conflict ()
  (interactive)
  (when (not (smerge-next-safe))
    (vc-find-conflicted-file)
    ;; At this point, the caret will only be at a conflict marker if the file did not
    ;; correspond to an opened buffer. Otherwise, we need to jump to a marker explicitly.
    (unless (looking-at "^<<<<<<<")
      (let ((prev-pos (point)))
        (goto-char (point-min))
        (unless (smerge-next-safe)
          (goto-char prev-pos)
          (message "No conflicts found"))))))

Answer 2

Magit does not support that currently, but I have just added a note to a related feature request.