MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: restore ability to Accept Yours/Theirs for submodule: IDEA-193788

Browse Source 
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
This commit is contained in:
Kirill Likhodedov
2018-06-18 18:17:32 +03:00
parent 99671a5456
commit fc52239b28
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+3 -5
View File
@@ -249,15 +249,13 @@ open class MultipleFileMergeDialog(
try { try {
if (mergeSession is MergeSessionEx) { if (mergeSession is MergeSessionEx) {
val supportedFiles = files.filter { file -> mergeSession.canMerge(file) } mergeSession.acceptFilesRevisions(files, resolution)
mergeSession.acceptFilesRevisions(supportedFiles, resolution) for (file in files) {
for (file in supportedFiles) {
checkMarkModifiedProject(file) checkMarkModifiedProject(file)
} }
markFilesProcessed(supportedFiles, resolution) markFilesProcessed(files, resolution)
} }
else { else {
for (file in files) { for (file in files) {