X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Frebase-jobs.sh;h=d8a982298b8964fcac2ecfc32edab80898ec1927;hb=refs%2Fchanges%2F43%2F2243%2F3;hp=e888d43e4516f5d212ab7075f3eebb0e1c1a38d3;hpb=e07b44c5d220997b892e73454f5b7403979f2960;p=infra%2Fcicd.git diff --git a/jjb/onap/rebase-jobs.sh b/jjb/onap/rebase-jobs.sh index e888d43e..d8a98229 100755 --- a/jjb/onap/rebase-jobs.sh +++ b/jjb/onap/rebase-jobs.sh @@ -32,7 +32,7 @@ git remote -v echo "-- Merging changes from ONAP remote branches to local branch: --" for branch in ${REMOTE_BRANCHES} ; do echo "------ Branch name: ${branch}" - git checkout ${branch} -q + git checkout ${branch} -q -f git merge origin/${branch} --ff-only --stat done echo "-- Pushing changes to Nordix Gerrit --"