Merge both v4 branches into a single one, & then cut a new release

4.0.24 was tagged off 4.0.x, but the default branch is 4.x. I expected these to be the same, but they're not.

Looking at the repository graph:

And here's proof that the code differs:

% git diff 4.x..4.0.x src/Service/EnvironmentIndicator.php
diff --git a/src/Service/EnvironmentIndicator.php b/src/Service/EnvironmentIndicator.php
index 9eee13f..f823d1c 100644
--- a/src/Service/EnvironmentIndicator.php
+++ b/src/Service/EnvironmentIndicator.php
@@ -61,7 +61,7 @@ class EnvironmentIndicator {
     ConfigFactoryInterface $config_factory,
     EntityTypeManagerInterface $entity_type_manager,
     StateInterface $state,
-    Settings $settings,
+    Settings $settings
   ) {
     $this->configFactory = $config_factory;
     $this->entityTypeManager = $entity_type_manager;

This caused my some problems with 💬 Granular permissions are not working as expected. Active , as different patches were required.

To fix, merge one branch into the other, and cut a new release. I can't see a good reason for having 2 branches here; it's very confusing.