Variable: vc-git-resolve-conflicts

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

Value

default

Documentation

Whether to mark conflicted file as resolved upon saving.

That is performed after all conflict markers in it have been removed.

If this is t and there are no more conflict markers in the file, VC will mark the conflicts in the saved file as resolved.

If the value is unstage-maybe, and no merge, rebase or similar operation is in progress, then after the last conflict is resolved, also clear the staging area.

A value of default means to use the value of vc-resolve-conflicts(var)/vc-resolve-conflicts(fun).

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

Probably introduced at or before Emacs version 31.1.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-git.el.gz
(defcustom vc-git-resolve-conflicts 'default
  "Whether to mark conflicted file as resolved upon saving.
That is performed after all conflict markers in it have been removed.

If this is t and there are no more conflict markers in the file,
VC will mark the conflicts in the saved file as resolved.

If the value is `unstage-maybe', and no merge, rebase or similar
operation is in progress, then after the last conflict is resolved, also
clear the staging area.

A value of `default' means to use the value of `vc-resolve-conflicts'."
  :type '(choice (const :tag "Don't resolve" nil)
                 (const :tag "Resolve" t)
                 (const :tag "Resolve and maybe unstage all files"
                        unstage-maybe)
                 (const :tag "Use vc-resolve-conflicts" default))
  :version "31.1")