Elijah Newren <newren@xxxxxxxxx> writes: > On Wed, Apr 7, 2021 at 7:13 PM Jerry Zhang <jerry@xxxxxxxxxx> wrote: >> >> "git apply" does not allow "--cached" and >> "--3way" to be used together, since "--3way" >> writes conflict markers into the working tree. >> >> Allow "git apply" to accept "--cached" and >> "--3way" at the same time. When a single file >> auto-resolves cleanly, the result is placed in the >> index at stage #0 and the command exits with 0 >> status. > > Should this instead read: > "...placed in the index at stage #0. If all files auto-resolve > cleanly, the command exits with 0 status." > or something like that? Perhaps. >> For a file that has a conflict which >> cannot be cleanly auto-resolved, the original >> contents from common ancestor (stage #1), our >> version (stage #2) and the contents from the >> patch (stage #3) are left at separate stages. >> No attempt is made to resolve the conflict at >> the content level, and the command exists with > > s/exists/exits/ Will squash it in.
