top | item 4670078 Xcode and git: bridging the gap 9 points| Croaky | 13 years ago |robots.thoughtbot.com | reply 2 comments order hn newest [+] [-] fam|13 years ago|reply 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_Geek|13 years ago|reply 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.
[+] [-] fam|13 years ago|reply 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_Geek|13 years ago|reply 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.
[+] [-] fam|13 years ago|reply
Similar for the most part, what do you guys think?
[+] [-] Aqua_Geek|13 years ago|reply