dstnbrkr · January 13, 2012 21:15
diff --git a/git-merge-combine b/git-merge-combine
 #!/bin/sh

 # Combines two versions of a file by removing all conflict markers
 # Usage: git-merge-combine MyProject.xcodeproj/project.pbxproj

 FILE=$1
 TMPFILE=$1.tmp
 sed -e 's/<<<<<<< HEAD//; s/=======//g; s/>>>>>>> .*$//' $FILE > $TMPFILE

 if [ $? -ne 0 ]; then
  exit;
 fi

 mv $TMPFILE $FILE
 git add $FILE
	#!/bin/sh

	# Combines two versions of a file by removing all conflict markers
	# Usage: git-merge-combine MyProject.xcodeproj/project.pbxproj

	FILE=$1
	TMPFILE=$1.tmp
	sed -e 's/<<<<<<< HEAD//; s/=======//g; s/>>>>>>> .*$//' $FILE > $TMPFILE

	if [ $? -ne 0 ]; then
	exit;
	fi

	mv $TMPFILE $FILE
	git add $FILE