2

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?

brain56
  • 2,659
  • 9
  • 38
  • 70

1 Answers1

2

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.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • If it is an evil twins, the simplest resolution is [described here](http://stackoverflow.com/a/2207119/6309). – VonC Jul 22 '13 at 06:30