conf: fetch next before merging back

ealush · Apr 1, 2020 · f8a9e36 · f8a9e36
1 parent 97ea692
commit f8a9e36
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/scripts/rebase_next.sh b/scripts/rebase_next.sh
@@ -2,6 +2,7 @@ git config --global user.email "${EMAIL_ADDRESS}" --replace-all
 git config --global user.name $GIT_NAME
 
 echo "Trying to update next branch"
+git fetch origin next
 git checkout next
 git rebase master || git rebase --abort
 git push https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG.git next