Function: majutsu-ediff-resolve

majutsu-ediff-resolve is an interactive and natively compiled function defined in majutsu-ediff.el.

Signature

(majutsu-ediff-resolve &optional ARG1)

Documentation

Resolve FILE conflicts using jj resolve with Emacs as merge editor.

If FILE is nil, DWIM selects from conflicted files at point revision (commit section) or the working copy.

Key Bindings

This command is not in any keymaps.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
;;;###autoload(autoload 'majutsu-ediff-resolve "majutsu-ediff" nil t)
(transient-define-suffix majutsu-ediff-resolve (&optional file)
  "Resolve FILE conflicts using `jj resolve' with Emacs as merge editor.
If FILE is nil, DWIM selects from conflicted files at point revision (commit
section) or the working copy."
  :advice* #'majutsu--transient-with-selection-buffer
  (interactive)
  (let* ((rev (or (majutsu-revision-at-point) "@"))
         (file (majutsu-ediff--resolve-file-dwim file))
         (sides (majutsu-ediff--conflict-side-count rev file)))
    (if (> sides 2)
        (progn
          (message "%s has %d sides; using diffedit fallback" file sides)
          (majutsu-diffedit-run-with-editor (list "-r" rev) file))
      (majutsu-ediff--run-resolve rev file))))