#15303: Coercion discovery fails to be transitive
-------------------------------------+-------------------------------------
Reporter: nbruin | Owner:
Type: defect | Status: needs_review
Priority: major | Milestone: sage-6.0
Component: coercion | Resolution:
Keywords: | Merged in:
Authors: Simon King | Reviewers:
Report Upstream: N/A | Work issues: Crash in permgroup.py
Branch: | Commit:
u/SimonKing/ticket/15303 | 528a03535447d67f04dc16d0a22cc38def54f9f1
Dependencies: #14711, #15329, | Stopgaps:
#15331 |
-------------------------------------+-------------------------------------
Comment (by SimonKing):
Gosh, I hate git!!!
After giving up on the merge, I tried "git checkout master", but it told
me
{{{
src/sage/misc/weak_dict.pyx: needs merge
src/sage/schemes/generic/morphism.py: needs merge
error: Du musst zuerst deine aktuelle Bereitstellung auflösen.
}}}
Sorry, but I simply don't want to continue with this merge! How do I tell
git that it shall please forget about this merge and bring me back to
either a clear master branch or a clear ticket branch?
--
Ticket URL: <http://trac.sagemath.org/ticket/15303#comment:105>
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/groups/opt_out.
