simonexmachina · October 15, 2015 06:45
diff --git a/mergepbx-setup.sh b/mergepbx-setup.sh
 # you can run this using:
 # curl -o- https://gist.githubusercontent.com/aexmachina/8608764bfb56c4e244b0/raw/e53953bfb97993059661daf623579763ccc95f03/mergepbx-setup.sh | bash
 set -o errexit  # exit on most errors

 brew install mergepbx
 git config --global merge.mergepbx.name "XCode project files merger"
 git config --global merge.mergepbx.driver "mergepbx %O %A %B"
 git config --global core.attributesfile ~/.gitattributes
 echo '*.pbxproj merge=mergepbx' >> ~/.gitattributes
	# you can run this using:
	# curl -o- https://gist.githubusercontent.com/aexmachina/8608764bfb56c4e244b0/raw/e53953bfb97993059661daf623579763ccc95f03/mergepbx-setup.sh \| bash
	set -o errexit # exit on most errors

	brew install mergepbx
	git config --global merge.mergepbx.name "XCode project files merger"
	git config --global merge.mergepbx.driver "mergepbx %O %A %B"
	git config --global core.attributesfile ~/.gitattributes
	echo '*.pbxproj merge=mergepbx' >> ~/.gitattributes