From fc52239b28a114f3f9584add0b9615d921cdb714 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 18 Jun 2018 18:15:45 +0300 Subject: [PATCH] vcs: restore ability to Accept Yours/Theirs for submodule: IDEA-193788 MergeSession.canMerge() is intended to be used only to enable/disable the Merge button. Although this is not entirely clear from the method name, it is stated in the method's javadoc, and it is safe to behave this way, since it actually makes sense just for Git submodules. Was broken in d3c7fa5 --- .../intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt index 15082070a551..9f8977d52ee4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt @@ -249,15 +249,13 @@ open class MultipleFileMergeDialog( try { if (mergeSession is MergeSessionEx) { - val supportedFiles = files.filter { file -> mergeSession.canMerge(file) } + mergeSession.acceptFilesRevisions(files, resolution) - mergeSession.acceptFilesRevisions(supportedFiles, resolution) - - for (file in supportedFiles) { + for (file in files) { checkMarkModifiedProject(file) } - markFilesProcessed(supportedFiles, resolution) + markFilesProcessed(files, resolution) } else { for (file in files) {