On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > If there is a conflict during a merge for a SKIP_WORKTREE entry, we > expect that file to be written to the working copy and have the > SKIP_WORKTREE bit cleared in the index. If the user had manually > created a file in the working tree despite SKIP_WORKTREE being set, we > do not want to clobber their changes to that file, but want to move it > out of the way. Add tests that check for these behaviors. Thank you for this test! -Stolee
