From 2ca308c2875783d54d0e4f790cbafad74d80b1d5 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Wed, 15 Oct 2025 06:28:38 -0700
Subject: [PATCH] Re-do changes lost between branch pointing.

---
 tasks/general/acct_mgmt/users.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index fd26603..83e1aa8 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -909,20 +909,25 @@
             echo "* Unsure which branch to use for '$rcvr'. Please specify."
             exit 1
           fi
-          echo "* Base not specified, using '$base' for '$rcvr'."
+          echo "* Base was not specified, using '$base' for '$rcvr'."
+        else
+          echo "* Requested pointing '$rcvr' branch to '$base'."
         fi
-        echo "* Ensuring we are on base branch '$base'." &&
+        echo -e "\n* Ensuring we are on base branch '$base'." &&
         git switch "$base" &&
-        echo "* Changing pointer for '$rcvr' to '$base'." &&
+        echo -e "\n* Changing pointer for '$rcvr' to '$base'." &&
         git branch -f "$rcvr" "$base" &&
-        #echo "* Switching to branch '$rcvr'." &&
+        #echo -e "\n* Switching to branch '$rcvr'." &&
         #git switch "$rcvr" &&
-        echo "* Forcing push on branch '$rcvr'." &&
+        echo -e "\n* Forcing push on branch '$rcvr'." &&
         git push --force --set-upstream origin "$rcvr" &&
-        #echo "* Switching back to '$base'." &&
-        #git switch "$base" &&
-        echo "* Done! Displaying list of remote branches." &&
+        echo -e "\n* Done! Displaying list of remote branches." &&
         git ls-remote --heads | sort
+
+        if [[ "$base" != "dev" ]]; then
+          echo -e "\n* Switching back to dev."
+          git switch "$base"
+        fi
       }
       alias load-prod="load-branch prod"
       alias load-stage="load-branch stage"