Be sure to set as exec (chmod +x)

gistfile1.txt

#!/bin/sh

git checkout $1
git pull origin $1
git checkout $2
git pull origin $2
git merge $1
git push origin $2
git checkout $1

mergeall

#!/bin/sh

set -e
set -x

export B1=$1
export B2=$2

cd Achievements;crossmerge $B1 $B2;cd ..;
cd admin;crossmerge $B1 $B2;cd ..;
cd api;crossmerge $B1 $B2;cd ..;
cd equipment;crossmerge $B1 $B2;cd ..;
cd sketch;crossmerge $B1 $B2;cd ..;
cd tempest;crossmerge $B1 $B2;cd ..;
cd website-main;crossmerge $B1 $B2;cd ..;
cd workout-manager;crossmerge $B1 $B2;cd ..;
cd log-workout;crossmerge $B1 $B2;cd ..;
cd workout-translator;crossmerge $B1 $B2;cd ..;