Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-05-16 11:36:18 -0400
committerjames2002-05-16 11:36:18 -0400
commit9dadad9ca710a75de5fd37702e9db5b4639b1a63 (patch)
tree335c900c92321aaf98e02dd14b1a9139ef19c021
parente1df21f64a8a88ec3ea2e0763aa7a1e9db7072cd (diff)
downloadeclipse.platform.team-9dadad9ca710a75de5fd37702e9db5b4639b1a63.tar.gz
eclipse.platform.team-9dadad9ca710a75de5fd37702e9db5b4639b1a63.tar.xz
eclipse.platform.team-9dadad9ca710a75de5fd37702e9db5b4639b1a63.zip
15995: Warning on "Override and Update" feels redundant
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
index 34bbd54b9..957eabae8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
@@ -39,4 +39,7 @@ public class ForceUpdateSyncAction extends UpdateSyncAction {
set.removeOutgoingNodes();
}
}
+ protected boolean promptForConflicts() {
+ return true;
+ }
}

Back to the top