Pergunta

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?

Foi útil?

Solução

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.

Licenciado em: CC-BY-SA com atribuição
Não afiliado a StackOverflow
scroll top