bin/mergebranch

   1 #!/bin/sh
   2 # mergebranch
   3
   4 CURBRANCH=`currentbranchname`
   5 updatebranch
   6 if ( git status|grep ".dotest/" ); then
   7         echo "Need to resolve conflicts updating branch before merge can continue..."
   8         exit -1
   9 else
  10         changebranch master
  11         updatebranch
  12         if ( git status|grep ".dotest/" ); then
  13                 echo "Need to resolve conflicts updating branch before merge can continue..."
  14                 exit -1
  15         else
  16                 git merge $CURBRANCH
  17                 changebranch $CURBRANCH
  18         fi
  19 fi