bin/mergefrommaster

   1 #!/bin/sh
   2 # mergefrommaster
   3
   4 CURBRANCH=`currentbranchname`
   5
   6 changebranch master
   7 updatebranch
   8 changebranch $CURBRANCH
   9 git merge master
  10 if ( git merge master|grep "You are in the middle of a conflicted merge." ); then
  11         echo "Need to resolve conflicts from merging in master changes before continuing with commit."
  12         exit -1
  13 fi