1 files changed, 1 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
index 00665e21b..f8ff17b92 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
@@ -116,16 +116,9 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
 		IResource local = info.getLocal();
 
 		if(diffNode instanceof SyncInfoModelElement) {
-			boolean wasConflict = isConflicting(diffNode);
-			// The update preserves any of the additional sync info bits
 			((SyncInfoModelElement)diffNode).update(info);
-			boolean isConflict = isConflicting(diffNode);
 			updateLabel(diffNode);
-			if (wasConflict && !isConflict) {
-				setParentConflict(diffNode, false);
-			} else if (!wasConflict && isConflict) {
-				setParentConflict(diffNode, true);
-			}
+			calculateProperties(diffNode);
 		} else {
 			removeFromViewer(local);
 			addResources(new IResource[] {local});