Xcode and git: bridging the gap

October 18, 2012 Tagged: git ios xcode Comments (View) Xcode and git: bridging the gap Apple integrated git into Xcode 4 in 2011 much to the relief of iOS developers everywhere. Unfortunately when collaborating on projects with multiple developers, Xcode and git can still seem miles apart. Here are some ways that we can bridge the gap. .gitignore The first adjustment is to tell git to ignore certain files generated by the OS X Finder and Xcode, artifacts from the build process and automatic backup files. The Xcode configuration files pertain to each developer’s install of Xcode and don’t need to be kept under version control. Add the following contents to a .gitignore file at your project’s root. # OS X Finder .DS_Store # Xcode per-user config *.mode1 *.mode1v3 *.mode2v3 *.perspective *.perspectivev3 *.pbxuser *.xcworkspace xcuserdata # Build products build/ *.o *.LinkFile...

Full article: http://robots.thoughtbot.com/post/33796217972/xcode-and-g...

Tweets

@kobusb » 29 Oct '12, 12pm
Xcode and git: bridging the gap - [link] Auto-merging .pbxproj files?! WHAT KIND OF SORCERY IS THIS?!
@stackful_io » 21 Oct '12, 3am
Xcode and git: bridging the gap [link] | VPS [link] | #developer #coding #xcode #osx #apple
@Iphonekiwiapp » 21 Oct '12, 1am
Xcode and git: bridging the gap [link] via @twttimes
@shineycode » 20 Oct '12, 4pm
Very helpful article on bridging the gap between Git and Xcode: [link]
@twelvelabs » 19 Oct '12, 6pm
Git config settings for Xcode projects. Again, could have saved me countless merge conflicts... [link]
@adycoles » 19 Oct '12, 10am
Useful piece from @thoughbot on using #XCode with #git [link] "Xcode and git: bridging the gap" #coding
@rgngl » 19 Oct '12, 9am
RT @matraty: Xcode and git: bridging the gap [link] via @zite
@scottm » 19 Oct '12, 8am
*Very* useful article about using Git with Xcode, especially for those working with others [link]
@KageKirin » 19 Oct '12, 1am
Xcode and git: bridging the gap [link] via @zite
@demmer12 » 19 Oct '12, 12am
For my friends who experience this pain so often: Xcode and git: bridging the gap [link]
@mackato » 18 Oct '12, 11pm
Xcodeのignore設定オレもこうしよう - Xcode and git: bridging the gap [link]
@kenancasey » 18 Oct '12, 9pm
Xcode and git: bridging the gap [link] @richardlsimpson
@kaishin » 18 Oct '12, 7pm
My colleague @21x9 explains how to bridge the gap between Xcode and git [link]
@ismaeldm » 18 Oct '12, 7pm
RT @planetonrails: Xcode and git: bridging the gap [link]
@DazeEnd » 18 Oct '12, 7pm
RT @nuthatch: $ cat > .gitattributes *.pbxproj binary merge=union via [link]
@phonghho » 18 Oct '12, 7pm
RT @HNTweets: Xcode and git: bridging the gap: [link] Comments: [link]
@nuthatch » 18 Oct '12, 6pm
$ cat > .gitattributes *.pbxproj binary merge=union via [link]
@cczona » 18 Oct '12, 6pm
RT @hnycombinator: Xcode and git: bridging the gap [link]
@withloudhands » 18 Oct '12, 6pm
@prolificpat i think i was talking to some of you guys in the cab about this problem the other night. [link]
@djtal64 » 18 Oct '12, 6pm
“@thoughtbot: Xcode and git: bridging the gap [link]” cc @gregoirejacquin ca peut t intersser
@JenniferLClarke » 18 Oct '12, 6pm
RT @21x9: Just published a post on the @thoughtbot blog about getting Xcode and git to play nice together. [link]
@21x9 » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@21x9 » 18 Oct '12, 6pm
Just published a post on the @thoughtbot blog about getting Xcode and git to play nice together. [link]
@HNTweets » 18 Oct '12, 6pm
Xcode and git: bridging the gap: [link] Comments: [link]
@ischroedi » 18 Oct '12, 6pm
thoughtbot news: Xcode and git: bridging the gap: Apple integrated git into Xcode 4 in 2011... [link] [link]
@smdahlen » 18 Oct '12, 10pm
Xcode and git: bridging the gap [link]
@mikaelhellqvist » 18 Oct '12, 8pm
RT @21x9: Just published a post on the @thoughtbot blog about getting Xcode and git to play nice together. [link]
@planetonrails » 18 Oct '12, 7pm
Xcode and git: bridging the gap [link]
@_Krisso_ » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@lukestringer90 » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@vichargrave » 18 Oct '12, 6pm
Xcode and git: bridging the gap [link]
@JenniferLClarke » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@pixel » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@MoonLightRSS1 » 18 Oct '12, 6pm
Xcode and git: bridging the gap [link]
@nyousefi » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@jsmecham » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@eebiejeebiez » 18 Oct '12, 6pm
RT @thoughtbot: Xcode and git: bridging the gap [link]
@thoughtbot » 18 Oct '12, 6pm
Xcode and git: bridging the gap [link]
@hnycombinator » 18 Oct '12, 6pm
Xcode and git: bridging the gap [link]