boolean () { SvnConfiguration configuration = myVcs.getSvnConfiguration(); Boolean add = configuration.isKeepNewFilesAsIsForTreeConflictMerge(); if (add != null) { return add; } if (!containAdditions(myTheirsChanges) && !containAdditions(myTheirsBinaryChanges)) { return false; } return Messages.YES == yesNo(message("dialog.title.resolve.tree.conflict"), message("dialog.message.keep.newly.created.files.in.their.original.place")) .yesText(message("button.keep")) .noText(message("button.move")) .doNotAsk( new DoNotAskOption() { @Override public boolean isToBeShown() { return true; } @Override public void setToBeShown(boolean value, int exitCode) { if (!value) { configuration.setKeepNewFilesAsIsForTreeConflictMerge(exitCode == 0); } } @Override public boolean canBeHidden() { return true; } @Override public boolean shouldSaveOptionsOnCancel() { return true; } @NotNull @Override public String getDoNotShowMessage() { return IdeCoreBundle.message("dialog.options.do.not.ask"); } }) .show(); }