#!/bin/sh

set -e
git checkout -q $_BRANCH
echo branch $_BRANCH $(git rev-parse HEAD) >> $__RESTORE_FILE
git rebase ${_REMOTE-origin}/$_BRANCH
git merge $__BUILD_BRANCH -q -m "Merge release branch into $_BRANCH" -s recursive -Xtheirs --ff
git checkout -q $__BUILD_BRANCH
