[petsc-users] reset release branch

[Matthew Knepley]

On Thu, Oct 1, 2020 at 4:30 AM Appel, Thibaut <t.appel17 at imperial.ac.uk>
wrote:

> Is ‘master’ still considered stable?
>

Yes. Note however that we are going to migrate that branch to the name
'main' after this release.

  Thanks,

    Matt


> Thibaut
>
> > ----------------------------------------------------------------------
> >
> > Message: 1
> > Date: Wed, 30 Sep 2020 09:14:41 -0500 (CDT)
> > From: Satish Balay <balay at mcs.anl.gov>
> > To: petsc-dev at mcs.anl.gov
> > Cc: petsc-users at mcs.anl.gov
> > Subject: [petsc-users] reset release branch
> > Message-ID: <alpine.LFD.2.23.451.2009300902130.2949 at sb>
> > Content-Type: text/plain; charset=US-ASCII
> >
> > All,
> >
> > I had to force fix the release branch due to a bad merge.
> >
> > If you've pulled on the release branch after the bad merge (before this
> fix) - and now have the commit 25cac2be9df307cc6f0df502d8399122c3a2b6a3 in
> it - i.e check with:
> >
> > git branch --contains 25cac2be9df307cc6f0df502d8399122c3a2b6a3
> >
> > please do:
> >
> > git checkout master
> > git branch -D release
> > git fetch -p
> > git checkout release
> >
> > [Note: As the petsc-3.14 release announcement e-mail indicated - we
> switched from using 'maint' branch to 'release' branch or release fixes]
> >
> > Satish
>
>

-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener

https://www.cse.buffalo.edu/~knepley/ <http://www.cse.buffalo.edu/~knepley/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-users/attachments/20201001/46ee0cc9/attachment.html>