0

I have just checked out a branch from a repo and there's one file that's showing as not found (! icon) and as new (? icon), one entry below the other.

No matter what I do the file keeps showing like this.

Neither reverting to the latest in repo will solve the problem.

Does anyone knows anything about it?

Cornerstone file conflict

Paulo Pedroso
  • 2,997
  • 2
  • 22
  • 32
  • Can you please try to delete the folder from the Finder and then in CornerStone right click the project and update to latest. – kbgn Mar 04 '14 at 02:37
  • First thing I did. Got the same result. I sorted out removing the file (saving it first) and adding it again (2 commits) but I would like people commenting on this as the issue is weird and absurd. Thanks. – Paulo Pedroso Mar 04 '14 at 13:01

0 Answers0