Review Branches - Githubissues

jdufner / microservice

Showcase of a microserivce architecture using the Spring Boot Netflix stack.

Apache License 2.0

3 stars 4 forks source link

Review Branches #30

Open jdufner opened 7 years ago

jdufner commented 7 years ago

Do we need all branches? What branches can we remove?

I suggest to remove following branches:

10_Docker_Images_skaliert
12_ELK-Stack_integriert

jdufner commented 7 years ago

Send me you feedback please.

jdufner commented 7 years ago

Rename 13_Logstash_konfiguriert to ELK-Stack_integriert

jdufner commented 7 years ago

Remove also branch 11a_ELK-Stack_only

Jumiboy commented 7 years ago

hmm, i have no opinion about it, yet :) Did you integrated those feature into any branch or are they obsolet? lets talk f2f about your intention with branche(name)s (feature or educative driven)

jdufner commented 7 years ago

@Jumiboy Thank you for f2f discussion today. All in all the my conclusion is:

Remove branch 10_Docker_Images_skaliert, because the content of that branch is too small.
Remove branch 12_ELK-Stack_integriert, because it is a intermediate step to branch 13
Remove branch 01_Zwei_Microservices_implementiert, because the activation of actuators is too small.

After that changes I want to rebase and rename all branches.

jdufner commented 7 years ago

I've tried to rebase old branches, but it produces such a lot of merge conflicts, that I doesn't go further.