Xcode and git: bridging the gap(robots.thoughtbot.com)

9 pointsby Croaky14 ปีที่แล้ว2 comments

robots.thoughtbot.com

http://robots.thoughtbot.com/post/33796217972/xcode-and-git-bridging-the-gap

2 comments

fam14 ปีที่แล้ว

I was actually looking into this a day ago and stumbled upon this .gitignore file: http://stackoverflow.com/questions/49478/git-ignore-file-for...

Similar for the most part, what do you guys think?

Aqua_Geek14 ปีที่แล้ว

I feel like there's got to be a better way to merge Xcode project files. Keeping both sides of the conflict blows up often enough that I usually resolve any conflicts manually in my text editor, so I'm hesitant to add a .gitattributes file.