also pull in changes from origin

diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh
index 7eb6426a78965b9142976caaedc0c1be6c661c64..436ffc54f94ad57695b14395560067947ca7d763 100755 (executable)
--- a/maven_pre_build_debian_wrapper.sh
+++ b/maven_pre_build_debian_wrapper.sh
@@ -26,7 +26,9 @@ if [ ${GIT_BRANCH_NAME:0:8} = "feature/" ] || [ ${GIT_BRANCH_NAME:0:7} = "bugfix
                #
                echo "Switching to integration branch..."
                git checkout integration
+               git pull origin integration
                echo "Trying to fast-forward merge $GIT_BRANCH_NAME..."
+               git fetch origin -fp
                git merge --no-ff origin/$GIT_BRANCH_NAME
        fi
 elif [ "$GIT_BRANCH_NAME" = "master" ] || [ "${GIT_BRANCH_NAME:0:7}" = "hotfix/" ] ; then