RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Oh I wasn't aware of this when I initialized my MWE repo, from git-config[1]:

  By default, git-rerere[1] is enabled if there is an rr-cache directory under
  the $GIT_DIR, e.g. if "rerere" was previously used in the repository.

The correct MWE requires to enable rerere:

  git config rerere.enabled true

--
Sylvain Bentz




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux