Conflict Resolution Tool

[JosephTLyons]

Zed should give the user a way to handle conflicts.

• Ability to step through all changes on left and right, and accept either side
• Ability to merge all non-conflicts
• Ability to manually edit the merged code
• Cleanly labeled. I would love to avoid "ours" and "theirs", using SHAs, etc., as this makes it hard if you are handling a conflict between two chunks of code you did not write. Let's just use the commit messages to make it easy to see which side is which.

A bonus would be that you never have to leave your keyboard to handle conflicts.

Related:

• Git conflict highlighting/resolution #4964

[SuperKenVery]

Really missing VSCode's merge editor!

[JosephTLyons]

Hey all, initial support for conflict resolution landed in v0.185.0-pre and will be in next stable release (May 7th). The initial version doesn't include all the mentioned features here, but we should open new discussions to track those specific conflict resolution features.

[SuperKenVery]

Any plans for a 3-way diff editor?