On Tue, 17 May 2022 at 02:57, Anastasia Klimchuk <[email protected]> wrote:
> Thanks so much for your thoughts everyone!

One more, if it helps. For fwupd we always have the "main" branch as
"release ready" -- as in you can tag a release and drop a tarball
without doing anything more than writing some release notes. This
works really well for us, and most of the development is done in "wip"
branches, some of which exist for months and are pushed by multiple
people. For wip branches we have a policy of "no rebasing" so
sometimes the wip branch gets branched into a different branch,
rebased and then development continues. We only rebase the branch when
merging to fix any conflicts.

Having the development branch in this "always good to go" state means
we can always drop a new release about once a month, and encourage
downstreams to just ship the latest version, rather than telling them
to cherry pick specific patches for bugs users are hitting.

Just my 2p; feel free to ignore :)

Richard.
_______________________________________________
flashrom mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to