[petsc-dev] Resolving merge conflicts in bitbucket fork?

[Jed Brown]

On Sun, Mar 10, 2013 at 12:57 PM, Tim Tautges <tautges at mcs.anl.gov> wrote:

> I've searched for an answer, but can't find anything... bitbucket is
> telling me I have merge conflicts with petsc-dev when I ask it to sync with
> petsc-dev.  I can't find a way to merge just some of the commits to
> petsc-dev to figure out where the conflict is.  Is there a way to do this
> through bitbucket?  I don't see a way to do this locally, since that's just
> a clone of the fork.


The conflict is in dmregall.c, as shown here.

https://bitbucket.org/petsc/petsc-dev/pull-request/5/another-attempt-at-petsc-moab/diff#chg-src/dm/interface/dmregall.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130310/5ab89066/attachment.html>