-perform_revctrl_action_on_file "$tempfile" do_careful_git_update "$(\pwd)"
-test_or_die "doing a careful git update on: $tempfile"
+# seems to be needed to cause a merge to be resolved.
+git pull downstream master
+# -m "unfortunate merge"
+exit_on_error "running the git pull downstream master"