Where's the `git -> resolve conflict` menu
已回答
I really dont want use `git command line` to merge conflicts
请先登录再写评论。
You have done the merge already, haven't you?
Resolve conflicts dialog appears after clicking Merge.
See https://www.jetbrains.com/help/idea/resolving-conflicts.html#distributed-version-control-systems