All (next users), Next is unwound again so please reset your next before pushing to it. [this is the easiest way to remove branches from next] Old next is saved at next-apr-2018-2 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.