[petsc-users] reset release branch

[Appel, Thibaut]

Is ‘master’ still considered stable?

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