We're just setting up Git with two people and a remote server just to get the flavor of how to move from SVN to using Git on a distributed team in Xcode 6.
We created an iOS project, committed it to the local Git repo on my box, then pushed it to the server. The other user cloned the repo and pulled and got the project as expected. Each of us tried making one change at a time, committing locally, then pushing and then pulling. Very quickly (within a few iterations of this), on a push, I ended up with a "The operation could not be performed because you do not have permission to modify 'master'". When my repo was in that state, the other user committed a change, pushed it and then when I tried a pull, Xcode couldn't because of a tree conflict. From my Mac, we tried a commit from the commit menu and then Xcode asked to commit xccheckout, which I did. Confusion has now set in. Some of the discussions online state that xccheckout only stores local repo data and should be added to the gitignore file. Should it be? If it is added to the gitignore file, should it be added to the remote repo and the local repos? Trying to the get to the bottom of this so we set up our repo properly. Don't want to run into tree conflicts and files we don't know if we should ignore or check in when dealing with remote teams. I've reviewed the WWDC videos on this, but what's the expected process here? Thanks in advance. Alex Zavatone _______________________________________________ Do not post admin requests to the list. They will be ignored. Xcode-users mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/xcode-users/archive%40mail-archive.com This email sent to [email protected]
