Problem
Currently when pulling and multiple files have conflicts, the user must resolve each conflict one by one — there's no way to batch-pull the non-conflicting files first, or apply a bulk resolution strategy across all conflicts.
Goal
Design and implement a better conflict-handling flow for batch pull, so users aren't forced into a fully sequential one-by-one resolution process when many files change at once.
Design Questions To Work Through
- Should non-conflicting files pull immediately/automatically, with only the conflicting subset requiring manual resolution?
- Should there be a bulk resolution option (e.g. "keep local for all", "keep remote for all") in addition to per-file resolution?
- How should the UI present multiple pending conflicts — a queue/list view vs. one modal at a time?
- What happens if the user abandons the batch pull partway through — is partial application safe, or does it need to be all-or-nothing?
Note
This needs a design pass on the conflict-resolution flow before implementation — not just a straightforward fix.
Problem
Currently when pulling and multiple files have conflicts, the user must resolve each conflict one by one — there's no way to batch-pull the non-conflicting files first, or apply a bulk resolution strategy across all conflicts.
Goal
Design and implement a better conflict-handling flow for batch pull, so users aren't forced into a fully sequential one-by-one resolution process when many files change at once.
Design Questions To Work Through
Note
This needs a design pass on the conflict-resolution flow before implementation — not just a straightforward fix.