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

Jumping to conflict regions will go to incorrect lines if file is edited in code editor. #6

Open
kpatenio opened this issue Aug 22, 2020 · 0 comments
Open

Jumping to conflict regions will go to incorrect lines if file is edited in code editor. #6

kpatenio opened this issue Aug 22, 2020 · 0 comments
Assignees
@kpatenio
Labels
enhancement New feature or request initial plugin (explain merge conflict)

Comments

@kpatenio
Copy link
Collaborator

Plugin reads the correct hunk data for conflict regions, but it assumes that the currently opened file is unedited. One fix for this is to open the file in a read-only view (like diffs or IntelliJ platform source code).
@kpatenio kpatenio added the enhancement New feature or request label Aug 22, 2020
@kpatenio kpatenio self-assigned this Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kpatenio kpatenio

Labels
enhancement New feature or request initial plugin (explain merge conflict)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@kpatenio