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
If I'm understanding this correctly, this handles all merge conflicts by launching each file in an editor, where the user can resolve the conflict, right? It might seem useful. Any reason why the --ignore-errors is needed?
launching each file in an editor, where the user can resolve the conflict, right?
Yes, all "both modified" files are opened in a single editor process (in most cases; rarely multiple processes), as in this command but it should be more API stable.
Though, it still opens files whose conflict-markers have been removed, which is annoying.
why the --ignore-errors is needed?
I misunderstood the add ("error" is unclear; it seems to refer to filesystem errs) docs and believed it was like diff --check (stage all files in WD except ones with conflict markers, return non-zero exit-code if any file in WD had markers)
I see, that makes sense to me, I think this would be a good addition! I think it should be called resolve-conflicts since that is more specific and informative.
I think that it is okay if it opens files where the conflict markers have been removed. As long as it opens the same files as before. It may be possible to add some sort of flag so that files without conflict markers are skipped.
If @spacewander OK's this as well, then I think you're good to move forward with the draft PR!
Activity
spacewander commentedon Feb 25, 2026
@hyperupcall
What do you think?
hyperupcall commentedon Feb 27, 2026
If I'm understanding this correctly, this handles all merge conflicts by launching each file in an editor, where the user can resolve the conflict, right? It might seem useful. Any reason why the
--ignore-errorsis needed?Rudxain commentedon Mar 3, 2026
Yes, all "both modified" files are opened in a single editor process (in most cases; rarely multiple processes), as in this command but it should be more API stable.
Though, it still opens files whose conflict-markers have been removed, which is annoying.
I misunderstood the
add("error" is unclear; it seems to refer to filesystem errs) docs and believed it was likediff --check(stage all files in WD except ones with conflict markers, return non-zero exit-code if any file in WD had markers)Rudxain commentedon Mar 4, 2026
I've opened #1236 to improve UX at the cost of doubling the size. I'm sure it can be optimized further, but IDK how
hyperupcall commentedon May 14, 2026
I see, that makes sense to me, I think this would be a good addition! I think it should be called
resolve-conflictssince that is more specific and informative.hyperupcall commentedon May 14, 2026
I think that it is okay if it opens files where the conflict markers have been removed. As long as it opens the same files as before. It may be possible to add some sort of flag so that files without conflict markers are skipped.
If @spacewander OK's this as well, then I think you're good to move forward with the draft PR!