No left and right pane on 'Resolve conflicts' window on PyCharm
I've searched, and asked peers on why both left and right panes are not showing up on resolving merge conflicts. The window should show a left and right panes; however, the middle pane is the only one showing up. Below is what I see when I go to: VCS | Git | Resolve Conflicts... Any help would be greatly appreciated! 
Please sign in to leave a comment.
How have you got such a conflict? Is it some kind of renamed-renamed conflict?
What does the git status show?
Are there any errors in the log?
@Dmitriy Smirnov I get this view every time I get a merge conflict. Currently my git status shows the following (different merge conflict from the one above):
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: web_app/cli3q-src/cli3q/static/css/home.css
both added: web_app/cli3q-src/cli3q/templates/home/home_main_banner.html
...
And there are no errors on git log.
I tried reinstalling pycharm, and still no luck. I'm the only one in my team that's getting this. Any other suggestions would be greatly appreciated!
I meant IDE log, actually.
Please submit an issue to https://youtrack.jetbrains.com/issues/IDEA with the logs attached.
To locate the logs refer to https://intellij-support.jetbrains.com/hc/en-us/articles/207241085