Skip to content

Instantly share code, notes, and snippets.

@alex-cellcity

alex-cellcity/solve_pbxproj_merge_conflict.sh

Forked from zbyhoo/solve_pbxproj_merge_conflict.sh
Created April 3, 2012 09:25
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save alex-cellcity/2290638 to your computer and use it in GitHub Desktop.
Save alex-cellcity/2290638 to your computer and use it in GitHub Desktop.
Download ZIP
Solving pbxproj files git merge conflicts when two users add files at the same time.
Raw
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment