CODEWITHSUNDEEP
xcodeversion-controlproject
jessy
jessy

Reputation: 491

Letter 'C' just beside app delegate file in project navigator

There is a letter 'C' just beside the app delegate file in the project navigator. Why is that there? I know the letter 'M' is there to notify me that the file has been modified, but I'm not sure about the letter 'C'.

Upvotes: 1

Views: 198

Answers (2)

Daniel
Daniel

Reputation: 481

it means you have a conflict in your code.. if the conflict is resolved you can mark the file as resolved in the utilities bar when you have your file open

Upvotes: 0

Rayfleck
Rayfleck

Reputation: 12106

This indicates a Conflict between your local file and the repository. In other words, you checked out, someone else checked out, they checked in, and now yours is out of date.

Upvotes: 1

Related Questions