#17425: Rational isometry test for quadratic forms over number fields
-------------------------------------+-------------------------------------
Reporter: annahaensch | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.9
Component: quadratic forms | Resolution:
Keywords: | Merged in:
Authors: Anna Haensch | Reviewers: Vincent Delecroix
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/annahaensch/ticket/17425 | 8b2f1aa042fae06af40366d50d86b02e17d6e66e
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by annahaensch):
I am on ticket/17425. When I run {{{git log master -1}}} it returns (as
expected) "Updated Sage version 6.8"
Now I tried to run {{{git merge master}}} and it says
{{{
fatal: You have no concluded your merge (MERGE_HEAD exists).
Please commit your changes before you can merge.
}}}
I think this is because I tried to merge earlier and got stuck in a vi
window and couldn't get out...oops. What do I do?
Thanks for your help!
--
Ticket URL: <http://trac.sagemath.org/ticket/17425#comment:25>
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.
