Best Practices using Git with Xcode

I wanted to share best practices using Git with Xcode project with everyone who had trouble running Git on Xcode projects.

If you have made any changes to your code and want to push just follow this steps:

  1. Commit from gity (free excellent GUI git tool).
  2. Pull from Xcode 4.3.2 (File->Source Control->Pull) (Xcode is good at solved .xcodeproj file conflicts).
  3. Solve conflicts using Xcode (if any)
  4. Commit and pushed from gity (or command line which is much more convenient).

If you want to get latest updates just pull from Xcode

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s