Skip to content

Issues: ualberta-smr/ExplainMergeConflict

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

10 Open 1 Closed
10 Open 1 Closed
Author
Filter by author
Loading
Label
Filter by label
Loading
Use alt + click/return to exclude labels
or ⇧ + click/return for logical OR
Projects
Filter by project
Loading
Milestones
Filter by milestone
Loading
Assignee
Filter by who’s assigned
Sort
Sort by
Newest Oldest Most commented Least commented Recently updated Least recently updated Best match
Most reactions
👍 👎 😄 🎉 😕 ❤️ 🚀 👀

Issues list

feat: jump to conflict regions in the diff 3 way diff Related to the IntelliJ 3 way diff functionality
#15 opened Nov 16, 2020 by kpatenio
@kpatenio
feat: conflict changes filter 3 way diff Related to the IntelliJ 3 way diff functionality
#14 opened Nov 16, 2020 by kpatenio
@kpatenio
feat: changes explanations on hover over conflicting regions 3 way diff Related to the IntelliJ 3 way diff functionality
#13 opened Nov 16, 2020 by kpatenio
@kpatenio
Having two projects open results in incorrect common ancestor commit id bug Something isn't working initial plugin (explain merge conflict) needs testing Something needs more test cases
#12 opened Sep 2, 2020 by kpatenio
@kpatenio
Do more thorough testing for regex expressions for diff output initial plugin (explain merge conflict) needs testing Something needs more test cases
#10 opened Aug 27, 2020 by kpatenio
@kpatenio
Display relevant refactors enhancement New feature or request initial plugin (explain merge conflict)
#9 opened Aug 22, 2020 by kpatenio
@kpatenio
Use log UIs in a bottom window to display relevant commits for conflict region enhancement New feature or request in progress Something is being worked on. initial plugin (explain merge conflict)
#8 opened Aug 22, 2020 by kpatenio
@kpatenio
Tool window contents are not properly disposed bug Something isn't working documentation Improvements or additions to documentation initial plugin (explain merge conflict)
#7 opened Aug 22, 2020 by kpatenio
@kpatenio
Jumping to conflict regions will go to incorrect lines if file is edited in code editor. enhancement New feature or request initial plugin (explain merge conflict)
#6 opened Aug 22, 2020 by kpatenio
@kpatenio
Reading commit history for empty sub conflict regions will throw errors bug Something isn't working initial plugin (explain merge conflict)
#5 opened Aug 22, 2020 by kpatenio
@kpatenio
ProTip! Updated in the last three days: updated:>2024-11-24.