Function: majutsu-conflict-keep-base

majutsu-conflict-keep-base is an interactive and natively compiled function defined in majutsu-conflict.el.

Signature

(majutsu-conflict-keep-base)

Documentation

Keep the snapshot base of the conflict at point.

Key Bindings

majutsu-conflict-mode-map C-c ^ b

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defun majutsu-conflict-keep-base ()
  "Keep the snapshot base of the conflict at point."
  (interactive)
  (let ((conflict (majutsu-conflict-at-point)))
    (unless conflict
      (user-error "No conflict at point"))
    (let ((base (or (majutsu-conflict-base conflict)
                    (car (majutsu-conflict-adds conflict)))))
      (unless base
        (user-error "No base in this conflict"))
      (majutsu-conflict-resolve-with conflict (cdr base)))))