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

[Peter Brune]

OK, it's completely ludicrous that this isn't fixed.  Matt, you have this
series of changesets

69d8a9c DMPlex: More fixup from bad rebase, moved to
DMGet/SetCoordinateSection()
e8abe2d DM: Added DMGet/SetCoordinateSection()
d7a12f9 Fuckup: Fix for merge that is still untangling bad rebase from Oct.
17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed
2 mallocs
e1648df replace all echo in test/tutorial makefiles with printf since echo
behaves differently on different systems
bb619f4 DMDA: Missing header - Damn rebase
6de54ef DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
9a800dd DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
3bfb4c2 DMDA: Fixed 2D geometry - Should reuse DMPlex routines
32638f2 DMDA: Fix bug in 2D closure operation for cells
a1ac9ad DMDA: Make closure operations also return the size
affa55c DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
3385ff7 DMDA: Added functions which emulate DMPlex functionality
3582350 DMDA: Now DMDAGetNumCells() returns the cells in each direction as
well

that probably shouldn't be in 'master'.  They conflict with

https://bitbucket.org/petsc/petsc/commits/branch/knepley/feature-dmda-section

and potentially other stuff in 'next'.  What's with all the working
directly on 'master' we're seeing now?

- Peter


On Mon, Dec 16, 2013 at 12:56 PM, Matthew Knepley <knepley at gmail.com> wrote:

> 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/20131217/b9df0ba3/attachment.html>