It contained merges of two branches that have been rewritten after the merge and didn't merge cleanly again.
Please reset your local next branch before merging something into it and pushing: git fetch git checkout next git reset --hard origin/next ... now you can continue as usual. Martin
_______________________________________________ fenics mailing list fenics@fenicsproject.org http://fenicsproject.org/mailman/listinfo/fenics
