[petsc-dev] error from Mira

[Jed Brown]

Mark Adams <adams at alcf.anl.gov> writes:

> *******************************************************************************
>          UNABLE to CONFIGURE with GIVEN OPTIONS    (see configure.log for details):
> -------------------------------------------------------------------------------
> PETSc makefiles contain mistakes or files are missing on filesystem.
> Makefile contains file not on filesystem: src/mat/order: ['<<<<<<<', 'HEAD']

Looks like you have a dirty tree with some merge junk in it.

$ git checkout -f next
$ git pull
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140304/981124ef/attachment.sig>