#18539: faster matroid 3 connectivity
-------------------------------------+-------------------------------------
Reporter: chaoxu | Owner: chaoxu
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-6.8
Component: matroid theory | Resolution:
Keywords: | Merged in:
Authors: Chao Xu | Reviewers: Michael Welsh, Rudi
Report Upstream: N/A | Pendavingh
Branch: | Work issues:
u/chaoxu/faster_matroid_3_connectivity| Commit:
Dependencies: | 34be00b7a1f4a0ffd0770fdf7734b995e3865f40
| Stopgaps:
-------------------------------------+-------------------------------------
Comment (by Rudi):
Hi Chao,
I am also still learning git so perhaps I'm not the right person to give
expert advice. But take a look at the way a merge conflict is resolved in
this recent ticket #17492. The way to go seems to be to merge the
conflicting ticket #18448 into your code. You can do so by a git trac pull
18448 while working on your ticket (this is destructive so if you want to
be safe, perform a merge of the two patches in a separate branch). The
automatic merge will partially fail and you have to repair some of the
source (probably matroid.pyx). Places where the automerger could not
decide what to do will be indicated in the source with <<< and >>>.
I doubt that the manual merge will be very difficult in this case, the
issue is probably that the new code in both tickets are more or less in
the same location. If you want, I will attempt the merge for you.
Just merging develop into your branch as you just did may not suffice,
since 18448 is not yet part of develop.
Cheers,
Rudi
--
Ticket URL: <http://trac.sagemath.org/ticket/18539#comment:51>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
