#17435: Cythonise path algebra elements
-------------------------------------+-------------------------------------
Reporter: SimonKing | Owner:
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-6.5
Component: algebra | Resolution:
Keywords: path algebra | Merged in:
elements | Reviewers:
Authors: Simon King | Work issues: Merge
Report Upstream: N/A | Commit:
Branch: | b080629d373feb384750218e99b9f77286fd79b9
u/SimonKing/cythonise_path_algebra_elements| Stopgaps:
Dependencies: #16453 #17526 |
-------------------------------------+-------------------------------------
Comment (by SimonKing):
What the heck is wrong with git?
I just tried to merge #17526 with the branch here. #17526 only changes
bitset.pxi. But `git merge` asks me to resolve conflicts in
bounded_integer_sequences.pyx. I am tired of these artificial conflicts
that git is producing.
--
Ticket URL: <http://trac.sagemath.org/ticket/17435#comment:24>
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.
