otakustay / react-diff-view

A git diff component
MIT License
841 stars 79 forks source link

Three-column view (request) #211

Open scf1984 opened 9 months ago

scf1984 commented 9 months ago

IntelliJ have three-column view that allows fixing conflicts by choosing edits from left/right. What would it take to create something like that with this package?

stale[bot] commented 9 months ago

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

otakustay commented 9 months ago

This isn't in our recent plan yet, 3-way merge is a good feature but we lack of times to implement that