#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 bhutz):

 I took a quick look at this conflict and it seems very bad to me.
 Something went quite wrong with merging in the latest beta. There are
 numerous conflicts throughout sage when I try and merge in the latest beta
 on my machine into this branch. I'm not sure how to fix something like
 this other than resetting back to 7d04713 and redoing the merge (which
 results in just a conflict in affine_morphism, the original problem he was
 trying to fix with the merge).

 Could someone with more git experience make a suggestion here as 'undoing'
 a commit is typically a bad course of action.

--
Ticket URL: <http://trac.sagemath.org/ticket/17001#comment:8>
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.

Reply via email to