[petsc-dev] *unwind* next branch

[Satish Balay]

All (next users),

Next is unwound so please reset your next branch before pushing to it.
[Its currently has some rebased/modified commits that's preventing
merges - and can potentially invalidate tests]

Old next is saved at next-jun-2018

Current branches that need to be re-merged to next:

  origin/barry/critical-point-divide-by-zero/maint
  origin/dalcinl/extern
  origin/denera/lmvm-mat-and-pc
  origin/rmills/fix-matsell-no-matconvertbasic/main

Suggest checking current nightlybuilds - and fix them appropriately
[if needed] before merging to next. You can also take this opportunity
to rebase/edit-commits - if desired.

Satish

---------------

Ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022747.html

So 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

Please *do not push* from a stale 'next' branch in your clone. If this is
attempted, the merge step should get a *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.