[petsc-dev] unable to merge into next from a branch from master

[Barry Smith]

  Matt,

    Is master ahead of next on some code now? I tried to merge a tiny change on a branch I just made off of master into next and got this:

~/Src/petsc  next $ git merge barry/compressed-coloring-only-for-square-matrices
Auto-merging src/dm/impls/plex/plexrefine.c
CONFLICT (content): Merge conflict in src/dm/impls/plex/plexrefine.c
Auto-merging src/dm/impls/plex/plexgeometry.c
CONFLICT (content): Merge conflict in src/dm/impls/plex/plexgeometry.c
Auto-merging src/dm/impls/da/dalocal.c
CONFLICT (content): Merge conflict in src/dm/impls/da/dalocal.c
Auto-merging src/dm/impls/da/dageometry.c
CONFLICT (content): Merge conflict in src/dm/impls/da/dageometry.c
Auto-merging src/dm/dt/interface/dtfe.c
CONFLICT (content): Merge conflict in src/dm/dt/interface/dtfe.c
Auto-merging include/petscdmda.h
CONFLICT (content): Merge conflict in include/petscdmda.h
Auto-merging config/builder.py
CONFLICT (content): Merge conflict in config/builder.py
Automatic merge failed; fix conflicts and then commit the result.
~/Src/petsc  next|MERGING $ git merge —abort

   Until this is resolved no one can put new things into next

    Thanks

     Barry