[petsc-dev] *unwind* next branch

[Balay, Satish]

All (next users),

We had to unwind next again - so you would also have to do the delete
and recreate next again!

Sorry about that.

If you try to merge across the old and new next versions - you should
get a merge conflict on include/petscversion.h. [i.e this merge
conflict indicates you have to recreate next - and *not* resolve/push]


$ git fetch
$ git merge origin/next
Auto-merging include/petscversion.h
CONFLICT (content): Merge conflict in include/petscversion.h
Automatic merge failed; fix conflicts and then commit the result.

Satish

On Wed, 2017-09-27 at 02:01 +0000, Balay, Satish wrote:

> So *all git repo users* (if you have/use 'next' branch in your clone)
> - please do the following (in all your git clones):
> 
> git checkout master
> git fetch
> git branch -D next
> git checkout next
>