Date: Sat, 22 Oct 2022 19:32:31 +0100 From: Steve O'Hara-Smith <steve@sohara.org> To: Kevin Oberman <rkoberman@gmail.com> Cc: "freebsd-questions@freebsd.org" <questions@freebsd.org> Subject: Re: Backing out port update that may have broken VirtualBox Message-ID: <20221022193231.6274d5ab8abb0351518534d5@sohara.org> In-Reply-To: <CAN6yY1taRO2PXPdLX7EROmuzgMfOBO1DKrRUPJDHmxBnqV1AkA@mail.gmail.com> References: <CAN6yY1vYCQnMaNPkUgq-hqFYrUcJm6i2VdNrB5EWrai22ogYXw@mail.gmail.com> <CAN6yY1uWXAa4FufexA6kj2zjvs%2BikUxZe4shZMrUYxjmRkfmhA@mail.gmail.com> <20221022183147.a112a82ea47d05c24e6f59f9@sohara.org> <CAN6yY1taRO2PXPdLX7EROmuzgMfOBO1DKrRUPJDHmxBnqV1AkA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 22 Oct 2022 10:52:09 -0700 Kevin Oberman <rkoberman@gmail.com> wrote: > Thanks! Never thought of branching. Many VC systems make a big deal out of branching and need to do a lot of work to make it happen - which makes branching something you don't tend to do or think of. Git breaks the mould in that respect, creating a branch is ridiculously cheap so experienced git users create branches at the drop of a hat. In a work environment it is common to create a branch for every individual piece of work - bug fix, feature, cleanup ... and if there are multiple release branches backporting is done by creating a branch off each release branch for each change being backported and cherry-picking the original commit to the branch - I'd hate to use something with expensive branches now. The only reason to bother cleaning up the dead ones is to get the noise out of the branch list for your own sanity, git can cope with silly numbers of them - this matters enough that at work I have a cron job for the purpose. -- Steve O'Hara-Smith Odds and Ends at http://www.sohara.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20221022193231.6274d5ab8abb0351518534d5>