0

In my iPhone app, I am using the in-built Git repository of Xcode 4 so that all the team members can work on the same project.

Now the problem is that even after I commit my changes to the repository, It still shows modified (M) symbol in front of the committed file.

What could be wrong?

I want to ensure that once I commit the changes it should not show "M" for that file.

Is there any setting which I have to do to make it work fine?

What can be done?

Improve this question
11
  • Did you commit your file from Xcode, or from the command line? Commented Jun 2, 2011 at 13:28
  • @Abizern: I committed my file from Xcode Commented Jun 2, 2011 at 13:36
  • And in the panel where you entered your commit message - did you select the file to be added to the commit? Commented Jun 2, 2011 at 13:38
  • @Abizern: Yes I selected my files before committing. Commented Jun 2, 2011 at 13:39
  • Have you verified that the files are in the commit by having a look at the git logs? Commented Jun 2, 2011 at 13:42

4 Answers 4

Reset to default
1

The built-in Git repository is a local repository only. How do you share that with your team? If you hooked that repository to GitHub, for example, you will experience problems as the implementation is not 100% reliable. I would use the command line in this case and git add/commit/push the changes. There are discussions and tutorials in the GitHub Blog.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

1

Without knowing what you're doing in Xcode, or how you have set up your repository all I can say is that you should check the status of your repository in the command line. Maybe your commit fails for some reason and you're not seeing the message in Xcode.

  • Try git status to see what state your repository is in.
  • Try git add <your files> and then git commit to see if you can actually commit your changes.
Improve this answer

Comments

0

Did you stage your files before committing (git add)? Otherwise the commit will do nothing.

Improve this answer

4 Comments

What does staging mean in this case? I generally just right click the file and click "add" under source control for the first time and then onwards I just do "Commit Changes".
Command line git has a two-step commit process. First you identify which changed files you want to commit by staging them. Once you have staged all files you want to commit, you commit the changes. This allows you to cherry-pick changed files into separate commits. Committing without first staging has no effect, as only staged changes are committed. In contrast, Mercurial will automatically commit all changed files. It doesn't have a staging concept (at least, not without enabling extensions).
OP's question is about Xcode's git interface, not the commandline git interface. Xcode hides git's add/commit distinction in order to present the same interface to the user for a project tracked by either SVN or git.
Xcode wouldn't be showing unstaged files as "M"odified, would it?
0

You would need to Push the changes in Xcode 4 to remove the "M" or modified status. If you don't have the command line mojo like most people, you can just use the functions built in as they were intended.

It won't solve your issue of sharing as it is only a local repo. I'm finding that even using Xcode 4 with an outside repo, you need to learn some command line stuff or it just isn't going to work, or at the very least kick your butt enough to make you consider giving it up.

*edit Just to make it clear, the process for Xcode 4 is as follows: File-->Source Control-->Commit File-->Source Control-->Push

Improve this answer

Comments

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.