#17001: Functionality for fast evaluation of affine morphisms
-------------------------------------+-------------------------------------
Reporter: gjorgenson | Owner:
Type: enhancement | Status: needs_work
Priority: minor | Milestone: sage-6.4
Component: algebraic | Resolution:
geometry | Merged in:
Keywords: | Reviewers: Ben Hutz
Authors: Grayson Jorgenson | Work issues:
Report Upstream: N/A | Commit:
Branch: | 676f5cec6fcbc19f8889bf154a92996e733b863d
u/gjorgenson/ticket/17001 | Stopgaps:
Dependencies: |
-------------------------------------+-------------------------------------
Comment (by tscrim):
The first thing to try is `git reset --hard HEAD^` to back up one commit,
then retry the merge, and then push it to a new branch name on trac
(perhaps a forced push is okay since the current branch is broken
essentially broken, or if no forced push, delete the current branch).
If that doesn't work, then I would create a new branch and `git cherry-
pick` the commits from the current branch which correspond to work on the
ticket (there's 2 such commits from looking at the log: `8a900a7` and
`7d04713`).
--
Ticket URL: <http://trac.sagemath.org/ticket/17001#comment:9>
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.
