#14896: Implement symbolic confluent hypergeometric functions
-------------------------------------+-------------------------------------
Reporter: eviatarbach | Owner: burcin
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-7.3
Component: symbolics | Resolution:
Keywords: hypergeometric, | Merged in:
kummer |
Authors: Eviatar Bach, | Reviewers: Jan Keitel, Ralf
Ralf Stephan | Stephan, Nils Bruin
Report Upstream: N/A | Work issues:
Branch: u/rws/14896 | Commit:
| da3a146a9ef69ff80e36e30f7e67a7ea56cd1312
Dependencies: #2516, #16697 | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by paulmasson):
Ralf, I'm trying to merge existing commits to a branch that already
includes #16697 but I'm getting errors:
{{{
STDOUT: Auto-merging src/sage/symbolic/expression_conversions.py
STDOUT: CONFLICT (content): Merge conflict in
src/sage/symbolic/expression_conversions.py
STDOUT: Auto-merging src/sage/symbolic/expression.pyx
STDOUT: Auto-merging src/sage/functions/special.py
STDOUT: Auto-merging src/sage/functions/other.py
STDOUT: CONFLICT (content): Merge conflict in
src/sage/functions/other.py
STDOUT: Auto-merging src/sage/functions/hypergeometric.py
STDOUT: Auto-merging src/sage/functions/all.py
STDOUT: CONFLICT (content): Merge conflict in
src/sage/functions/all.py
STDOUT: Automatic merge failed; fix conflicts and then commit the
result.
}}}
Am I doing something wrong or do these commits need updating after all
this time? Would like to get this one reviewed.
--
Ticket URL: <https://trac.sagemath.org/ticket/14896#comment:40>
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 https://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
