[petsc-dev] *unwind* next branch

Balay, Satish balay at mcs.anl.gov
Fri Mar 29 11:08:29 CDT 2019

All (next users),

ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2017-September/021361.html

I've recreated 'next' branch - and have a backup for current 'next' at 'origin/next-mar-2019'.
[Note: this backup is from Mar 21. Subsequently next was used as a rewrite-able branch]

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.                                                                                                            


Ref:currently merged branches in old next

$ comm -12 <(git branch -r --merged origin/next-mar-2019 | sort) <(git branch -r --no-merged origin/master | sort)

More information about the petsc-dev mailing list