I know about M, A, U, ?, R, I.
I searched for the ↓ and C but not found any helpful resources.
This post doesn't contain info about ↓.
Can anyone tell me what indicates these symbols?
Thank you in advance.
Asked
Active
Viewed 2,320 times
3
sohan vanani
- 1,417
- 1
- 17
- 37
-
Are you sure it is an arrow and not the `!` symbol? – rmaddy Nov 16 '17 at 16:54
-
Yes, it's a down arrow not ! – sohan vanani Nov 16 '17 at 18:47
-
Can you post relevant portion of a screenshot showing some files with the arrow? – rmaddy Nov 16 '17 at 19:15
-
After pushing on git this arrow has been gone but whenever this arrow will be there I will attach screenshot thank you so much for understanding. I am using Xcode 9.0 – sohan vanani Nov 16 '17 at 19:17
2 Answers
6
C means conflict — you tried to merge (or implicitly merge due to a pull) a branch where, in the marked file, git can't automatically resolve the differences between your working copy and the other branch. You'll need to use Xcode's version editor or an external tool to manually decide which changes from each side to keep, then tell git that the conflicts are resolved (IIRC in Xcode you can do this by right-clicking on the file in the navigator).
↓ means your working copy is "behind" the other branch by some number of commits (in this case, because the conflict meant it couldn't catch up).
rickster
- 118,448
- 25
- 255
- 308
0
Down arrow indicated that your local working directory has changes. C means conflict your local file and remote file has changes in same places.
Manish Mahajan
- 1,763
- 1
- 9
- 17