Fortgeschrittene Themen im Branch-Handling ans Ende geschoben

diff --git a/BRANCHES.sh b/BRANCHES.sh
index 4be3424..9408611 100755 (executable)
--- a/BRANCHES.sh
+++ b/BRANCHES.sh
@@ -41,10 +41,6 @@ producer__spring_producer__auditheaders__vorlage=producer/spring-producer--audit
 producer__spring_producer__auditheaders__vorlage__ROOT=producer/spring-producer--auditheaders
 producer__spring_producer__generics=producer/spring-producer--generics
 producer__spring_producer__generics__ROOT=producer/spring-producer
-producer__spring_producer__long=producer/spring-producer--long
-producer__spring_producer__long__ROOT=producer/spring-producer
-producer__spring_producer__long__vorlage=producer/spring-producer--long--vorlage
-producer__spring_producer__long__vorlage__ROOT=producer/spring-producer--long
 producer__rest_producer=producer/rest-producer
 producer__rest_producer__ROOT=producer/spring-producer
 spring__spring_producer=spring/spring-producer
@@ -87,38 +83,6 @@ consumer__spring_consumer=consumer/spring-consumer
 consumer__spring_consumer__ROOT=grundlagen/simple-consumer
 consumer__spring_consumer__vorlage=consumer/spring-consumer--vorlage
 consumer__spring_consumer__vorlage__ROOT=consumer/spring-consumer
-consumer__spring_consumer__generics=consumer/spring-consumer--generics
-consumer__spring_consumer__generics__ROOT=consumer/spring-consumer
-consumer__spring_consumer__rebalance_listener=consumer/spring-consumer--rebalance-listener
-consumer__spring_consumer__rebalance_listener__ROOT=consumer/spring-consumer
-consumer__spring_consumer__rebalance_listener__vorlage=consumer/spring-consumer--rebalance-listener--vorlage
-consumer__spring_consumer__rebalance_listener__vorlage__ROOT=consumer/spring-consumer--rebalance-listener
-consumer__spring_consumer__log_compaction=consumer/spring-consumer--log-compaction
-consumer__spring_consumer__log_compaction__ROOT=consumer/spring-consumer--rebalance-listener
-consumer__spring_consumer__seek=consumer/spring-consumer--seek
-consumer__spring_consumer__seek__ROOT=consumer/spring-consumer
-consumer__spring_consumer__seek__vorlage=consumer/spring-consumer--seek--vorlage
-consumer__spring_consumer__seek__vorlage__ROOT=consumer/spring-consumer--seek
-consumer__spring_consumer__logic_error=consumer/spring-consumer--logic-error
-consumer__spring_consumer__logic_error__ROOT=consumer/spring-consumer
-consumer__spring_consumer__logic_error__vorlage=consumer/spring-consumer--logic-error--vorlage
-consumer__spring_consumer__logic_error__vorlage__ROOT=consumer/spring-consumer--logic-error
-consumer__spring_consumer__long=consumer/spring-consumer--long
-consumer__spring_consumer__long__ROOT=consumer/spring-consumer
-consumer__spring_consumer__deserialization_error=consumer/spring-consumer--deserialization-error
-consumer__spring_consumer__deserialization_error__ROOT=consumer/spring-consumer--long
-consumer__spring_consumer__deserialization_error__vorlage=consumer/spring-consumer--deserialization-error--vorlage
-consumer__spring_consumer__deserialization_error__vorlage__ROOT=consumer/spring-consumer--deserialization-error
-consumer__spring_consumer__record_handler=consumer/spring-consumer--record-handler
-consumer__spring_consumer__record_handler__ROOT=consumer/spring-consumer--deserialization-error
-consumer__spring_consumer__health_indicator=consumer/spring-consumer--health-indicator
-consumer__spring_consumer__health_indicator__ROOT=consumer/spring-consumer--record-handler
-consumer__spring_consumer__error_handling=consumer/spring-consumer--error-handling
-consumer__spring_consumer__error_handling__ROOT=consumer/spring-consumer--record-handler
-consumer__spring_consumer__assign=consumer/spring-consumer--assign
-consumer__spring_consumer__assign__ROOT=consumer/spring-consumer
-consumer__spring_consumer__assign__vorlage=consumer/spring-consumer--assign--vorlage
-consumer__spring_consumer__assign__vorlage__ROOT=consumer/spring-consumer--assign
 spring__spring_consumer__livecoding=spring/spring-consumer--livecoding
 spring__spring_consumer__livecoding__ROOT=grundlagen/simple-consumer
 spring__spring_consumer__vorlage=spring/spring-consumer--vorlage
@@ -147,6 +111,42 @@ spring__spring_consumer__kafkalistener=spring/spring-consumer--kafkalistener
 spring__spring_consumer__kafkalistener__ROOT=consumer/spring-consumer
 spring__spring_consumer__kafkalistener__concurrency=spring/spring-consumer--kafkalistener--concurrency
 spring__spring_consumer__kafkalistener__concurrency__ROOT=spring/spring-consumer--kafkalistener
+producer__spring_producer__long=producer/spring-producer--long
+producer__spring_producer__long__ROOT=producer/spring-producer
+producer__spring_producer__long__vorlage=producer/spring-producer--long--vorlage
+producer__spring_producer__long__vorlage__ROOT=producer/spring-producer--long
+consumer__spring_consumer__logic_error=consumer/spring-consumer--logic-error
+consumer__spring_consumer__logic_error__ROOT=consumer/spring-consumer
+consumer__spring_consumer__logic_error__vorlage=consumer/spring-consumer--logic-error--vorlage
+consumer__spring_consumer__logic_error__vorlage__ROOT=consumer/spring-consumer--logic-error
+consumer__spring_consumer__long=consumer/spring-consumer--long
+consumer__spring_consumer__long__ROOT=consumer/spring-consumer
+consumer__spring_consumer__deserialization_error=consumer/spring-consumer--deserialization-error
+consumer__spring_consumer__deserialization_error__ROOT=consumer/spring-consumer--long
+consumer__spring_consumer__deserialization_error__vorlage=consumer/spring-consumer--deserialization-error--vorlage
+consumer__spring_consumer__deserialization_error__vorlage__ROOT=consumer/spring-consumer--deserialization-error
+consumer__spring_consumer__seek=consumer/spring-consumer--seek
+consumer__spring_consumer__seek__ROOT=consumer/spring-consumer
+consumer__spring_consumer__seek__vorlage=consumer/spring-consumer--seek--vorlage
+consumer__spring_consumer__seek__vorlage__ROOT=consumer/spring-consumer--seek
+consumer__spring_consumer__assign=consumer/spring-consumer--assign
+consumer__spring_consumer__assign__ROOT=consumer/spring-consumer
+consumer__spring_consumer__assign__vorlage=consumer/spring-consumer--assign--vorlage
+consumer__spring_consumer__assign__vorlage__ROOT=consumer/spring-consumer--assign
+consumer__spring_consumer__generics=consumer/spring-consumer--generics
+consumer__spring_consumer__generics__ROOT=consumer/spring-consumer
+consumer__spring_consumer__rebalance_listener=consumer/spring-consumer--rebalance-listener
+consumer__spring_consumer__rebalance_listener__ROOT=consumer/spring-consumer
+consumer__spring_consumer__rebalance_listener__vorlage=consumer/spring-consumer--rebalance-listener--vorlage
+consumer__spring_consumer__rebalance_listener__vorlage__ROOT=consumer/spring-consumer--rebalance-listener
+consumer__spring_consumer__log_compaction=consumer/spring-consumer--log-compaction
+consumer__spring_consumer__log_compaction__ROOT=consumer/spring-consumer--rebalance-listener
+consumer__spring_consumer__record_handler=consumer/spring-consumer--record-handler
+consumer__spring_consumer__record_handler__ROOT=consumer/spring-consumer--deserialization-error
+consumer__spring_consumer__health_indicator=consumer/spring-consumer--health-indicator
+consumer__spring_consumer__health_indicator__ROOT=consumer/spring-consumer--record-handler
+consumer__spring_consumer__error_handling=consumer/spring-consumer--error-handling
+consumer__spring_consumer__error_handling__ROOT=consumer/spring-consumer--record-handler
 spring__spring_consumer__kafkalistener__logic_error=spring/spring-consumer--kafkalistener--logic-error
 spring__spring_consumer__kafkalistener__logic_error__ROOT=spring/spring-consumer--kafkalistener
 spring__spring_consumer__kafkalistener__long=spring/spring-consumer--kafkalistener--long
@@ -173,8 +173,6 @@ BRANCHES="\
   producer__spring_producer__auditheaders \
   producer__spring_producer__auditheaders__vorlage \
   producer__spring_producer__generics \
-  producer__spring_producer__long \
-  producer__spring_producer__long__vorlage \
   producer__rest_producer \
   spring__spring_producer \
   spring__spring_producer__json \
@@ -194,21 +192,6 @@ BRANCHES="\
   consumer__simple_consumer__spickzettel__vorlage \
   consumer__spring_consumer \
   consumer__spring_consumer__vorlage \
-  consumer__spring_consumer__generics \
-  consumer__spring_consumer__rebalance_listener \
-  consumer__spring_consumer__rebalance_listener__vorlage \
-  consumer__spring_consumer__log_compaction \
-  consumer__spring_consumer__seek \
-  consumer__spring_consumer__seek__vorlage \
-  consumer__spring_consumer__logic_error \
-  consumer__spring_consumer__logic_error__vorlage \
-  consumer__spring_consumer__long \
-  consumer__spring_consumer__deserialization_error \
-  consumer__spring_consumer__deserialization_error__vorlage \
-  consumer__spring_consumer__record_handler \
-  consumer__spring_consumer__health_indicator \
-  consumer__spring_consumer__error_handling \
-  consumer__spring_consumer__assign \
   spring__spring_consumer__livecoding \
   spring__spring_consumer__vorlage \
   spring__spring_consumer__json \
@@ -223,6 +206,23 @@ BRANCHES="\
   spring__supersimple_consumer__vorlage \
   spring__spring_consumer__kafkalistener \
   spring__spring_consumer__kafkalistener__concurrency \
+  producer__spring_producer__long \
+  producer__spring_producer__long__vorlage \
+  consumer__spring_consumer__logic_error \
+  consumer__spring_consumer__logic_error__vorlage \
+  consumer__spring_consumer__long \
+  consumer__spring_consumer__deserialization_error \
+  consumer__spring_consumer__deserialization_error__vorlage \
+  consumer__spring_consumer__seek \
+  consumer__spring_consumer__seek__vorlage \
+  consumer__spring_consumer__assign \
+  consumer__spring_consumer__generics \
+  consumer__spring_consumer__rebalance_listener \
+  consumer__spring_consumer__rebalance_listener__vorlage \
+  consumer__spring_consumer__log_compaction \
+  consumer__spring_consumer__record_handler \
+  consumer__spring_consumer__health_indicator \
+  consumer__spring_consumer__error_handling \
   spring__spring_consumer__kafkalistener__logic_error \
   spring__spring_consumer__kafkalistener__long \
   spring__spring_consumer__kafkalistener__deserialization_error \