Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Three-column view (request) #211

Open
scf1984 opened this issue Nov 24, 2023 · 2 comments
Open

Three-column view (request) #211

scf1984 opened this issue Nov 24, 2023 · 2 comments

Comments

@scf1984
Copy link

scf1984 commented Nov 24, 2023

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 Stale
Copy link

stale bot commented Dec 15, 2023

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.

@stale stale bot added the stale label Dec 15, 2023
@otakustay
Copy link
Owner

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

@stale stale bot removed the stale label Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@otakustay @scf1984