The "Apply Non-conflicting Changes" is missing in Intellij 15
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
Please sign in to leave a comment.
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", ...)
You're right. Thanks!.