Home
IDEs Support (IntelliJ Platform) | JetBrains
Contact Support
Community
Sign in

Volumilot

Avatar
  • Total activity 3
  • Last activity June 24, 2022 10:15
  • Member since June 10, 2022 09:03
  • Following 0 users
  • Followed by 0 users
  • Votes 0
  • Subscriptions 1
Activity overview Posts (0) Comments (2)
  • Volumilot commented, June 24, 2022 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. Community
    2. IntelliJ IDEA Users
    3. Center panel of "Resolve Conflicts" window is also locked?
    • 0 votes
  • Volumilot commented, June 10, 2022 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. Community
    2. IntelliJ IDEA Users
    3. Center panel of "Resolve Conflicts" window is also locked?
    • 0 votes
Copyright © 2000– JetBrains s.r.o.