You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Sparse: an untracked file at an out-of-view path that the other side adds wins over the merge result at completion (public and private paths) #248
Found reviewing #244. refuse_untracked_overwrite skips out-of-view paths by design and snapshot_files lets a file already on disk win, so on a sparse checkout an untracked file at a path the other side cleanly adds outside the view is committed instead of the addition, silently (no error). Reproduced on the public path with a plain merge + commit. On the private merge-in path (#244) the stop now leaves the file alone and completion commits its bytes into the sealed tree (before #244 the stop overwrote the user's file). Fix belongs in the shared guard for both paths: refuse (or treat as a conflict) when an untracked file exists at a path the merge adds outside the view, before any write.
Activity
fix(repo): guard leaving a private branch too; review fixes (#248)
docs(adr): note the partial-clone limit of the out-of-view guard (#248)
fix(repo): note why the partial-clone limit stays; comment the blocke…
fix(repo): let a private abort and case-only renames pass the out-of-…
fix(repo): limit the out-of-view case-alias exception to laid-out pat…
fix(repo): refuse an untracked file at an out-of-view path the merge …
fix(repo): merge main; out-of-view guard refuses any directory (#247, #…