search

freifunkh / site

Freifunk Hannover specific Gluon site configuration for Firmware building.
https://hannover.freifunk.net
5 stars 5 forks source link

README: Add well-known branches #63

Closed lemoer closed 2 years ago

lemoer commented 2 years ago

@1977er As you recently mentioned, that you did not know which branch is suited for what... Is this sufficient for you?

1977er commented 2 years ago

Guess so.

lemoer commented 2 years ago

@s-2 In general, @AiyionPrime and I discussed that it would be maybe a good idea to use feature branches for purposes, that are not covered by this well-known branches. These branches could be more volatile. We also discussed that we would like those feature branches to be cleaned up a bit (maybe squashed or so) if they are merged to well-known branches (if they are merged at all). Does this suit your needs?

s-2 commented 2 years ago

I agree next as a well-known branch should probably reflect upstream gluon-next directly, without any further commits from our side, i.e. experimental device support could go into separate feature branches.

Currently, it's quite a hassle to build combinations of features (e.g. there is only fastd for devices from the next branch), not sure how to address this without creating an even more confusing mess of additional branches though.

// edit: maybe we can have something like "multiple inheritance", i.e. automated cherry-picking from different branches at build time?

lemoer commented 2 years ago

@s-2 Atm, automating this seems to be an overkill to me. Maybe you can hack some shell scripts for your purpose to track two feature branches easily (or so).