needs to be adapted to our new careful update method.
git fetch origin
test_or_die "running git fetch origin"
git fetch origin
test_or_die "running git fetch origin"
+
+#these are all shots in the dark.
+# use our careful updater!
+
+git remote update
+
+# get everything from the origin.
+git fetch --all
+
+# merge the changes in.
+git merge --no-ff --all
+
# turn off occasionally troublesome setting before checkin.
unset GIT_SSH
# turn off occasionally troublesome setting before checkin.
unset GIT_SSH