Solving pbxproj files git merge conflicts when two users add files at the same time.

solve_pbxproj_merge_conflict.sh

#!/bin/sh

projectfile=`find -d . -name 'project.pbxproj'`
projectdir=`echo *.xcodeproj`
projectfile="${projectdir}/project.pbxproj"
tempfile="${projectdir}/project.pbxproj.out"
savefile="${projectdir}/project.pbxproj.mergesave"

cat $projectfile | grep -v "<<<<<<< HEAD" | grep -v "=======" | grep -v "^>>>>>>> " > $tempfile
cp $projectfile $savefile
mv $tempfile $projectfile

vim project.pbxproj
:g/(>>>>>|=====|<<<<<).*/d

you should escape (,|,)
so it should be command:

:g/\(>>>>>\|=====\|<<<<<\).*/d