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

Use log UIs in a bottom window to display relevant commits for conflict region #8

Open
kpatenio opened this issue Aug 22, 2020 · 0 comments
Assignees
Labels
enhancement New feature or request in progress Something is being worked on. initial plugin (explain merge conflict)

Comments

@kpatenio
Copy link
Collaborator

Implement log UI views as a bottom tool window like that of the git tool window. It should display commits, apply filters to be relevant to the branch, and highlight overlapping commits.

@kpatenio kpatenio added the enhancement New feature or request label Aug 22, 2020
@kpatenio kpatenio self-assigned this Aug 22, 2020
@kpatenio kpatenio added the in progress Something is being worked on. label Aug 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request in progress Something is being worked on. initial plugin (explain merge conflict)
Projects
None yet
Development

No branches or pull requests

1 participant