[Libre-soc-dev] Switching development style to using git branches instead of working on master

Jacob Lifshay programmerjake at gmail.com
Wed Oct 4 07:41:33 BST 2023

As luke and I suggested (and multiple others):
I think we should switch our development style so we do all
non-trivial work in git branches, and then we only merge to git master
after CI passes and someone appropriate has given the ok. the reviewer
should be someone familiar with the changed parts of the codebase.

Luke, I think this should include you, since you can make mistakes too
and that's what this process does a better job of catching.

There would be a partial exception for the wiki since that's intended
to be edited through ikiwiki (and also standard git push), which afaik
can only work on git master.

Blocking merging on CI passing would practically require that stuff
gets mirrored to salsa multiple times a day so people don't have to
wait 24h to merge something.

The definition of CI passing we should use is that nothing new is
broken, if something that's being worked on is broken, it needs to
stay in a branch until it isn't broken, or we've determined that it's
impractical to fix (e.g. something outside our control broke, such as
a power outage at my house).

What does everyone think?


More information about the Libre-soc-dev mailing list