Before you merge your work into next again, do

git checkout next
git reset --hard origin/next

NB! if you have local changes in next you will have to merge them back
again.

Martin
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics

Reply via email to