X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;fp=scripts%2Frev_control%2Fversion_control.sh;h=b1035c53549f633fdf1c23de8872abc7f0603938;hb=8d09ec8f586f0ee22fe4fd0103a8c29483ab34b7;hp=e1cb4192d4bcd8de812c39bf38e44bcb31fb8686;hpb=23a54a83032f2102030c23ae98d34aea75bb4855;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index e1cb4192..b1035c53 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -379,14 +379,12 @@ function do_careful_git_update()
   show_branch_conditionally "$this_branch"
 
   # this code is now doing what i have to do when i repair the repo.  and it seems to be good so far.
+  # note that we allow the local branch to be merged with its remote counterpart; otherwise we would
+  # miss changes that happened elsewhere which should be seen in our local copy.
   local branch_list=$(all_branch_names)
   local bran
   for bran in $branch_list; do
 #    echo "synchronizing remote branch: $bran"
-    if [ "$this_branch" == "$bran" ]; then
-      echo "skipping redundant update on initial branch: $bran"
-      continue;
-    fi
     git checkout "$bran" | $TO_SPLITTER
     promote_pipe_return 0
     test_or_die "git switching checkout to remote branch: $bran"