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.

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

feat: jump to conflict regions in the diff #15

Open
kpatenio opened this issue Nov 16, 2020 · 0 comments
Open

feat: jump to conflict regions in the diff #15

kpatenio opened this issue Nov 16, 2020 · 0 comments
Assignees
Labels
3 way diff Related to the IntelliJ 3 way diff functionality

Comments

@kpatenio
Copy link
Collaborator

Description

For large files, finding and comparing conflict regions can be tedious when scrolling through the IntelliJ 3 way diff. Although there is an option to jump from one difference to the next via the provided arrows at the top left corner of the diff window, this jump applies for all differences, and not only those relating to those that conflict. By having the option to jump from one conflicting difference to the other, we can quickly find the relevant conflict regions at the click of a button.

To implement this design, we would have to rely on IntelliJ's APIs. In the initial version of ExplainMergeConflict, there is already functionality that determines the range (lines of code) for a particular conflict region. We can use this for this particular feature.

Sample design

image

@kpatenio kpatenio added the 3 way diff Related to the IntelliJ 3 way diff functionality label Nov 16, 2020
@kpatenio kpatenio self-assigned this Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 way diff Related to the IntelliJ 3 way diff functionality
Projects
None yet
Development

No branches or pull requests

1 participant