When the .gitatribute file is setup to change the file line-ending
in the repository the file will be updated straight after git checkout.
The -f flag will ignore those normalized files which cause
the rebuild job to fail for some ONAP projects.
Change-Id: I34007888815956fd04809d693c5fee0df1017c8a
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 --"