void (ActionEvent e) { int ok = Messages.showOkCancelDialog( myVcs.getProject(), message("dialog.message.accept.theirs.for.path", filePath(myPath)), message("dialog.title.resolve.tree.conflict"), Messages.getQuestionIcon() ); if (Messages.OK != ok) return; FileDocumentManager.getInstance().saveAllDocuments(); final Paths paths = getPaths(description); ProgressManager.getInstance().run( new VcsBackgroundTask<>( myVcs.getProject(), message("progress.title.accepting.theirs.for.path", filePath(paths.myMainPath)), Collections.singletonList(description), true ) { @Override protected void process(TreeConflictDescription d) throws VcsException { new SvnTreeConflictResolver(myVcs, paths.myMainPath, paths.myAdditionalPath).resolveSelectTheirsFull(); } @Override public void onSuccess() { super.onSuccess(); if (executedOk()) { showOverChangesView(myProject, message("message.theirs.accepted.for.file", filePath(paths.myMainPath)), MessageType.INFO); } } }); }