Merge branch 'main' into merge-main-into-pals

* main:
  Revert "knapsack gemfile additions or replacement"
  ♻️ Updating Gemfile to reflect pointing to main
  knapsack gemfile additions or replacement

Gemfile

@@ -106,6 +106,13 @@ gem 'webmock', group: %i[test]
 
 # This gem does nothing by default, but is instead a tool to ease developer flow
 # and place overrides, themes and deployment code.
-gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'upstream_main'
+#
+# When you use a knapsack for Hyku development, which we recommend, you'll want to ensure that your
+# local knapsack repository has a `main` branch (which it should by default).  Due to some
+# tomfoolery, of knapsack, the branch name (e.g. `main`) must be checked out locally in the knapsack
+# environment that you use to build Docker.
+#
+# tl;dr - Have a local main branch on your knapsack repository
+gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'main'
 
 # rubocop:enable Layout/LineLength

Gemfile.lock

@@ -95,8 +95,8 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/hyku_knapsack.git
-  revision: 14f688b61afab9ee886f5f7fa26a76a37bced597
-  branch: upstream_main
+  revision: 418a390fad222120a36e29271ba6c80ff91b358c
+  branch: main
   specs:
     hyku_knapsack (0.0.1)
       rails (>= 5.2.0)