Merge origin/develop instead of develop

Author: fsbraun

scripts/make-release

@@ -165,8 +165,8 @@ else
     status "git checkout ${BRANCH}"
     git checkout "${BRANCH}"
 
-    status "git merge ${base_branch}"
-    if ! git merge --no-edit --commit ${base_branch}; then
+    status "git merge origin/${base_branch}"
+    if ! git merge --no-edit --commit origin/${base_branch}; then
         git merge --abort || true
         error "##################################################################"
         error "Cannot automatically merge ${base_branch} into ${BRANCH}."