Date: Wed, 9 Dec 2020 19:17:09 -0700 From: Warner Losh <imp@bsdimp.com> To: "Conrad E. Meyer" <cem@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: question regarding git branches Message-ID: <CANCZdfr0=ea=UBtyxtKiPi5Cg6enArci0AS0mhB%2Bhso_zc8_5A@mail.gmail.com> In-Reply-To: <CAG6CVpVs=78uh1sRdmbk=uTz5xjp_gfjoL69LUXSpk94c%2BKsXA@mail.gmail.com> References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> <CAG6CVpVs=78uh1sRdmbk=uTz5xjp_gfjoL69LUXSpk94c%2BKsXA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 9, 2020 at 5:38 PM Conrad Meyer <cem@freebsd.org> wrote: > Hi Jason, > > I believe the plan at this time is to use a single branch, rebase&push > workflow initially. This is basically the same model as our > Subversion workflow, so it is more of a 1:1 transition. Afterwards, > we might transition to a PR+merge model. I think the long-term > workflow is still undecided. > > This is just my best understanding and someone on the Git team > probably knows better. > This is right. Long term, we'll almost certainly retain a linear history, but offer ways to send pull requests that are rebased and committed. Phase 1 is all about a great leap sideways from svn to git. Phase 2 and beyond can then be done more iteratively (with perhaps lots of experimentation). Warner > Best regards, > Conrad > > On Wed, Dec 9, 2020 at 4:17 PM <jgh@freebsd.org> wrote: > > > > Hi, > > > > I am a little late to the dance with git in respect to FreeBSD (haven't > > been following as much as I would like to given availability), but have > > been using it for awhile now at work and personally. With the recent > > migration from svn to git for documentation I saw that there was only > > one branch named "main." I think this is great that we also went with > > this name. > > > > My question more so is around workflow. Typically, it is seen as good > > practice to commit to a new branch and then merge to the main branch. Is > > this something that is being done as part of the commit process, or are > > commits being done straight to main branch? > > > > I'm not sure I need to go into the reasoning of having multiple branches > > and what that can do insofar as community and mentoring support, > > development CI/CD pipelines, etc. If this conversation goes down this > > path, though, I would be more than happy to discuss along with others. > > > > Thanks in advance! > > -jgh > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr0=ea=UBtyxtKiPi5Cg6enArci0AS0mhB%2Bhso_zc8_5A>