Berik Visschers berikv

xslim / solve_pbxproj_merge_conflict.sh

Created February 10, 2012 15:47 — forked from zbyhoo/solve_pbxproj_merge_conflict.sh

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

	#!/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

mikeash / gist:1254684

Created September 30, 2011 19:07

	dispatch_block_t RecursiveBlock(void (^block)(dispatch_block_t recurse))
	{
	// assuming ARC, so no explicit copy
	return ^{ block(RecursiveBlock(block)); };
	}

	typedef void (^OneParameterBlock)(id parameter);

	OneParameterBlock RecursiveBlock1(void (^block)(OneParameterBlock recurse, id parameter))
	{