Branch naming conventions

[jochenklar]

I would like to make the branch names a bit more constant. Currently we use something like:

3.0.0
3.0.0-project
3.0.0-fix-navbar

I would like to change this to

3.0.0/release
3.0.0/project
3.0.0/fix/navbar
3.0.0/feature/cool-new-feature
3.0.0/no-clue-where-to-put-it

I did some research and the convention seems to be:

release/3.0.0
feature/project
fix/navbar

but I am convinced we should keep sorting the branches by release, since we have very long-living branches and we need to track where those branch from.

What do you think @MyPyDavid @afuetterer @CalamityC (and anyone else with opinions on those things)?

[jochenklar]

The only thing which will not work is to have 3.0.0 and 3.0.0/foo at the same time, since those are basically directories.

[CalamityC]

As long as we have strict rules how to name it I don't mind how it is done.

[MyPyDavid]

yes agree, your proposition seems good to me!

[MyPyDavid]

Now that we have dynamic versioning (and don’t need the bump version commit any longer) , how can we create a new release branch and PR to main? By committing and pushing a tag maybe?

[jochenklar]

I think I will just update the CHANGELOG.md. This does not necessarily means we need to update it while developing. It is ok to do this at the end.