Volumilot

创建于 2022年06月24日 10:15

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 a...

1. 社区
2. IntelliJ IDEA Users
3. Center panel of "Resolve Conflicts" window is also locked?

• 0 票

创建于 2022年06月10日 09:03

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.

1. 社区
2. IntelliJ IDEA Users
3. Center panel of "Resolve Conflicts" window is also locked?

• 0 票