+git branch -f akpm-current/current akpm/current
+
+git branch -f akpm/base HEAD
+
+old_head=$(git rev-parse HEAD)
+hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
+log Merging akpm-current/current "($hlog)"
+execute git merge --no-ff akpm-current/current || {
+ echo Merge failed 1>&2
+ echo $h >>../merge.debug
+ git diff >>../merge.debug 2>&1
+
+ check_unmerged_files akpm-current
+
+ git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+ bash -i || exit
+ }
+ GIT_EDITOR=: execute git commit -v -a
+ execute git diff -M --stat --summary 'HEAD^..'
+}
+printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
+
+[ -f "../merge-fixes/akpm-current" ] && {
+ for p in $(cat "../merge-fixes/akpm-current"); do
+ $(dirname $0)/merge_fix -n "$p" || {
+ bash -i || exit
+ }
+ done
+}
+
+new_head=$(git rev-parse HEAD)
+
+$no_build ||
+ [ "$old_head" = "$new_head" ] ||
+ [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
+
+ git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
+ echo git push failed 1>&2
+ bash -i || exit
+ }
+ "$bin_dir/do_build" akpm-current || {
+ echo Build failed 1>&2
+ bash -i || exit
+ }
+}
+