Re: Xcode 4 + git (part 3)
Re: Xcode 4 + git (part 3)
- Subject: Re: Xcode 4 + git (part 3)
- From: Luther Baker <email@hidden>
- Date: Wed, 23 Mar 2011 21:28:33 -0500
One thing to note.
If you include the dot star pattern in your .gitignore file, .* ... you may want to be sure and explicitly add the .gitignore file into the repository. (dot star ignores it by default).
$ git add -f .gitignore
Try it without the -f and you'll get prompted what to do as well.
Also, while it is indeed great to have native SCM support in the IDE, some of the Mac Git clients can make your life alot easier in the interim:
-Luther
On Wed, Mar 23, 2011 at 7:17 PM, Quincey Morris
<email@hidden> wrote:
> On Mar 23, 2011, at 13:10, Luther Baker wrote:
>
> +1 for using .gitignore. You may want to include the following entries as well:
>
> build
> .*
> *.mode1v3
> *.pbxuser
>
> On Wed, Mar 23, 2011 at 2:47 PM, David Duncan <email@hidden> wrote:
>
>> On Mar 23, 2011, at 12:13 PM, Quincey Morris wrote:
>>
>>> I think it's even a bad idea to try and put the workspace "file" (i.e. package) under SCM control, because Xcode changes it too often. At least several times during my marathon, when I *did* have the workspace package under SCM, I couldn't push to the remote server because something part of getting to the menu item dirtied one of the private state files, so I just got told to commit first, which just took me round in a circle. But maybe that was a different problem.
>>
>> We use a .gitignore file with ".DS_Store" and "xcuserdata/" entries to avoid this. Just put it at the root of your repository and you should be set.
Part 3 of this saga is where I have to back down some. *Today*, now that I seem to have really removed the workspace file from the repository, committing and pushing from the workspace window works fine. Go figure!
Furthermore, I notice that in the commit sheet from the workspace window, there's a third list-style option icon whose tooltip is "By Project". So apparently workspaces weren't forgotten in the design phase after all. It's just a pity that you can't (apparently) use the workspace as the root of a cluster of projects that live in a remote repository. (Perhaps you can, but if so it's not clear how to get this all going.)
I also created a .gitignore as above, and that helps. I even put the .gitignore file in the project, so that I can fiddle with it from within Xcode. Thanks for the tip!
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden