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

[Matthew Knepley]

On Sun, Dec 15, 2013 at 9:23 AM, Barry Smith <bsmith at mcs.anl.gov> wrote:

>
>   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:
>

Okay, I will fix it. It may take me until tonight since I am in Madison at
a meeting.

I am not sure why Git cannot do this merge, but it should be easy.

    Matt


> ~/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
>
>
>
>


-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131216/5daf0725/attachment.html>