Update build branches script

build-scripts/build_branches.sh

@@ -30,8 +30,7 @@ do
              git checkout . 
              git reset HEAD --hard
              git checkout $BRANCH
-		  git merge $GIT_ORIGIN_NAME/$BRANCH
-		  
+             git reset $GIT_ORIGIN_NAME/$BRANCH --hard
 	     sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE >  ${VERSION_FILE}.bak
 	     mv ${VERSION_FILE}.bak ${VERSION_FILE}