I'm currently using Xcode with Git, and I'm experiencing some troubles during the merge process of my xcodeproj.

Developer1 create a new group in Xcode file arborescence the commit and push. Developer2 on an other computer do the same with an other group name, commit and pull(with merge).

The xcodeproj of Developer 2 become unreadable with Xcode.

But when I create a new file or just drag and drop files from finder to repository, the merge succeed.

Did someone has experienced that kind of trouble?

I'm using in .gitattributes:

*.pbxproj -crlf -diff merge=union
# Better to treat them as binary files.
*.pbxuser -crlf -diff -merge
*.xib -crlf -diff -merge

and in my .gitignore

# Mac OS X
*.DS_Store
*~

# Xcode
*.mode1v3
*.mode2v3
*.perspectivev3
*.xcuserstate
project.xcworkspace/
xcuserdata/

*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/*.pbxuser

# Generated files
*.o
*.pyc
*.hi

#Python modules
MANIFEST
dist/
build/

# Backup files
*~.nib
\#*#
.#*