CODEWITHSUNDEEP
eclipsesvniconssubclipse
brain56
brain56

Reputation: 2701

Eclipse Subclipse icon with red plus sign

What does the icon enter image description here (a red plus sign) in Subclipse mean? What do I do if I want to get whatever is from the repository regarding this file?

Upvotes: 2

Views: 864

Answers (1)

VonC
VonC

Reputation: 1323483

This is a merge conflict icon, more specifically a tree conflict, where a file has been created twice. This blog post also explains how to resolve them.

A tree conflict occurs when a developer moved/renamed/deleted a file or folder, which another developer either also has moved/renamed/deleted or just modified.

Upvotes: 2

Related Questions