Center panel of "Resolve Conflicts" window is also locked?
I have Intellij 2021.2.1 and am having trouble using the "Resolve Conflicts" merge window with a simple Git merge.
The instruction page here: https://www.jetbrains.com/help/idea/resolve-conflicts.html contains the following text:
IntelliJ IDEA provides a tool for resolving conflicts locally. This tool consists of three panes:
The left pane shows the read-only local copy
The right pane shows the read-only version checked in to the repository.
The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the base revision of the file, that is, the revision from which both conflicting versions are derived.
However, in my Resolve Conflicts window ALL THREE PANES are locked, displaying the little "padlock" icon at the top left, and I do not get the >> and << symbols for merging text. Naturally, it is impossible to do any kind of merge in this situation.
Is this a permission issue or what? All files are local, so network issues are not a factor.
请先登录再写评论。
Hello Tom Williamson
it would be helpful if you could share a screenshot of an issue. By the way - are you able to edit this file in a regular editor?
Also you can submit a support request and attach logs to your ticket.
I will submit a screenshot and logs the next time it happens.
I can share a screenshot of the issue. WebStorm 2022.1.1. The problem has happened during a merge with the only changed .go file.
The file in a "Resolve" window also looks strange.
Volumilot, thank you very much! I had to get this done, so I did the merge manually and eventually forgot about this. I hope they have a solution for it.
Is it possible to edit a file in any other editor (notepad) when you have such issue?
Ruslan Kuleshov
Yes, I managed to merge these files manually using the vim. But the WebStorm was in an unsolvable merge conflict after that. Then I resolved git conflicts using a system terminal and invalidated the WebStorm caches with project reopening. It helped.
I was also running into this issue while using Pycharm 2023.1 and I got the same view as in Volumilots screenshot. I did the following:
On the left pane that shows the "Default Changelist" I clicked "Resolve" and then out of "Accept theirs, Accept yours, Merge" I clicked "Merge". This resulted in the three panes mentioned above with a fully functional editor in the central pane. Maybe this is helpful to someone.