@@ -71,6 +71,12 @@ if [ ! -d $RESULTSDIR ]; then
mkdir $RESULTSDIR
fi
+# Do another pull to make sure we're as up to date as possible. This is
+# preferable to committing and rebasing before pushing as it would be better to
+# waste some time repeating work than commit potentially corrupted files from a
+# git merge gone wrong.
+git -C $METRICSDIR pull
+
cd ..
set +u
. oe-init-build-env build
@@ -87,6 +87,12 @@ if [ "$BRANCH" != "master" ]; then
exit 0
fi
+# Do another pull to make sure we're as up to date as possible. This is
+# preferable to committing and rebasing before pushing as it would be better to
+# waste some time repeating work than commit potentially corrupted files from a
+# git merge gone wrong.
+git -C $METRICSDIR pull
+
#
# Patch Metrics
#