"Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > Update: Elijah points out that the SKIP_WORKTREE bit is removed from > conflict files, which allows adding the conflicted files without warning. > (However, we also need to be careful about untracked files, as documented in > the test added here.) > > The first patch of this series adds tests that create merge conflicts > outside of the sparse cone and then presents different ways a user could > resolve the situation. We want all of them to be feasible, and this > includes: > > 1. Reverting the file to a known version in history. > 2. Adding the file with its contents on disk. > 3. Moving the file to a new location in the sparse directory. > > The one place I did continue to update is 'git add --refresh ' to match the > behavior added by mt/add-rm-in-sparse-checkout which outputs an error > message. This happens even when the file exists in the working directory, > but that seems appropriate enough. > > > Updates in V3 > ============= > > * Added disclaimer to the merge-conflict test that this is documenting > current behavior, not endorsing it. > > * Added Elijah's reviewed-by. Thanks for the review! > > Thanks, -Stolee Thanks, both. Let's queue this and start merging it down.
