The "Apply Non-conflicting Changes" is missing in Intellij 15

Permanently deleted user

创建于 2015年12月03日 01:26

In the Conflict Resolution Tool, the "Apply Non-conflicting Changes" is missing! Please see screenshot.

The button I'm referring to is described in the link in the "To apply all non-conflicting changes" section: https://www.jetbrains.com/idea/help/resolving-conflicts.html

I'm using IntelliJ 15.0.1 Build 143.382

2 条评论

Aleksey Pivovarov

创建于 2015年12月03日 12:46

This is a read-only view of conflicted changes.

To resolve conflict you can invoke corresponding action ("Git -> Resolve Conflicts", "HG -> Run Conflict Resolver", "SVN -> Resolve Text Conflict", ...)

Permanently deleted user

创建于 2015年12月03日 21:25

You're right. Thanks!.

请先登录再写评论。