Where is "Git Resolve Conflict" Menu-Point in PhpStorm 2020.3 ?
I have made the Update, but now i don't find the Menu-Point: VCS | GIT | Resolve Conflicts, where ist there gone?
Documentation here is no longer correct?
https://www.jetbrains.com/help/phpstorm/resolve-conflicts.html
请先登录再写评论。
Hi there,
AFAIK it's no longer "VCS | Git" but just "Git" (menu item name should now change based on the VCS you are using for that project). Might be in a submenu though (e.g. Merge)
https://blog.jetbrains.com/idea/2020/12/intellij-idea-2020-3/
>Your VCS menu displays the actions relevant to the version control system you are using for your project
I love PHPStorm's Resolve Conflict. It's so easy to use and saves a ton of time. I couldn't find the option anywhere in the Git / merge option. I WAS there until a recent update. I have 2020.3.
What I did was create a short cut for it.
1. Go to preferences
2. Search for "resolve conflict"
3. It'll tell you it's under Git / Merge.
4. Make a new short cut for it.
My use case is that I have a branch and I stashed the changes. I created a new branch. When I stash pop, I had conflicts (via SourceTree). I went over to Storm and I couldn't find the option until I thought of adding a short cut for it. It works.
Hope it's useful to someone.