On Sat, 12 Aug 2023 01:45:27 -0400 (EDT) Ineiev <invalid.nore...@gnu.org> wrote: > Enabling non-fast-forward commits in master and changing the default > branch conflicts with our policies;
The issue we have is that the master branch has only one commit and the commit was a work in progress that wasn't supposed to end in the main/master branch like that. Here's its commit message: > commit 86e8130b70c11eb6766864aed42581cff37f6353 > Date: Tue Jun 20 21:04:13 2023 +0200 > > WIP: Initial commit And here we can't just revert that commit because it conflicts with another goal we have which is to base it on top of the commit of last release of Libreboot that didn't include nonfree software. So we want to use that commit as a base: > commit fbbb5bc616b08a5cd747735b0612fd0f0046c7fe (tag: 20220710) > Author: Leah Rowe <l...@libreboot.org> > Date: Sat Jul 9 20:50:39 2022 +0100 > > Libreboot 20220710 And also to keep the exact same hash (fbbb5bc616b08a5cd747735b0612fd0f0046c7fe) to make it easy to check what we modified. Once this is done, even if later on we mess up in some way, we'd still have a clean history that is based on the right commit. Is there an easy solution for that? Also are we obligated to use the master branch for consistency reasons with other projects or are we expected to pick the default branch once and stick to it? > other branches can be removed this way: Thanks a lot. Denis.
pgpYZ2tn_tj7g.pgp
Description: OpenPGP digital signature
