1

when i commit the changes i made in my project in Xcode, and then want to push them onto the server, xcode says i would have uncommitted changes, but I was just committing...

Therefor I can not push or pull to the server :-(

i do not have enough reputation to post image so i uploaded it to imageshack http://imageshack.us/a/img268/7136/bildschirmfoto20120924u.png

i already added .dsstore files to the .gitignore

Thank you!

rcpfuchs
  • 792
  • 1
  • 12
  • 26
  • can you check using the command line? `git status` will give you more information. – willoller Sep 24 '12 at 17:48
  • ok did that status thing when the error appears again: – rcpfuchs Sep 24 '12 at 18:30
  • # On branch master # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: .DS_Store # But .gitignore is: .DS_Store build/ *.pbxuser xcuserdata/ – rcpfuchs Sep 24 '12 at 18:31
  • You may have added .DS_Store to the repo before you ignored it. This creates a bunch of hassle. Try `git rm .DS_Store` and commit. – willoller Sep 24 '12 at 22:10

1 Answers1

2

OK i think i got it. Xcode does not list hidden files like .DS_Store so I had to remove the file from version control with git rm --cached .DS_Store. git status made my day thanks

rcpfuchs
  • 792
  • 1
  • 12
  • 26
  • 1
    Where do you put that command. In other words, What is the directory where that command has to be runned? Thanks!! – ElPiter Aug 06 '13 at 17:38
  • 1
    Hey just in the root directory of the project that is under version controll. Where git status gives you a meaningful answer ;) – rcpfuchs Aug 07 '13 at 07:15