I’ve noticed a few different things happening around branching, so wanted a wider discussion
- We seem to be using
develfor our development branch names in a few places. I recall that we’d decided that all development should happen in
devel. Should we fix these?
- Should we run with a unpinned manifest for most of our layers until
feature freeze? IMO, this is acceptable during development, but there might be concerns about too much instability, so it is worth a discussion. Another way to think about this is that our
default.xmlmanifest would always be unpinned (crack-of-the-day) but after feature freeze, we could have a
release-v1.xmlmanifest that would track all the stable/release branches.
- Do we agree on the model of rebasing the
develbranch until feature freeze so that:
- All our local patches float to the top
- Any patches that already got merged usptream throw conflicts and can get removed from the local set