Variable: vc-git-resolve-conflicts

vc-git-resolve-conflicts is a customizable variable defined in vc-git.el.gz.

Value

t

Documentation

When non-nil, mark conflicted file as resolved upon saving.

That is performed after all conflict markers in it have been removed. If the value is unstage-maybe, and no merge is in progress, then after the last conflict is resolved, also clear the staging area.

This variable was added, or its default value changed, in Emacs 25.1.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-git.el.gz
(defcustom vc-git-resolve-conflicts t
  "When non-nil, mark conflicted file as resolved upon saving.
That is performed after all conflict markers in it have been
removed.  If the value is `unstage-maybe', and no merge is in
progress, then after the last conflict is resolved, also clear
the staging area."
  :type '(choice (const :tag "Don't resolve" nil)
                 (const :tag "Resolve" t)
                 (const :tag "Resolve and maybe unstage all files"
                        unstage-maybe))
  :version "25.1")