From e8e2f7c37e0dd4d8dbb1d361c8efa43538fe1809 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 12:51:06 -0500 Subject: [PATCH] enabling pulls again in dev branch --- scripts/rev_control/version_control.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 8c714ece..45da6325 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -279,15 +279,16 @@ else echo "Diverged" fi -echo The rest of pull is not being done yet. -return 1 - # now pull down any changes in our own origin in the repo, to stay in synch # with any changes from others. - git pull --no-ff origin + git pull --no-ff --all test_or_die "git fetch origin" +echo The rest of pull is not being done yet. +return 1 + + # below has older shards of partial knowledge. -- 2.34.1