#15580: Integrate prereq in the new build system
-------------------------------------+-------------------------------------
Reporter: jdemeyer | Owner:
Type: defect | Status: positive_review
Priority: blocker | Milestone: sage-6.1
Component: distribution | Resolution:
Keywords: | Merged in:
Authors: R. Andrew Ohana, | Reviewers: R. Andrew Ohana
Jeroen Demeyer | Work issues:
Report Upstream: N/A | Commit:
Branch: | 0255a2a53e9aebaf54c0fab335ef0202a6b77ae8
u/jdemeyer/ticket/15580 | Stopgaps:
Dependencies: #15596 |
-------------------------------------+-------------------------------------
Comment (by ohanar):
Replying to [comment:28 jdemeyer]:
> Why does it say "does not merge cleanly"? It merges cleanly for me...
This particular merge confuses a lot of git tools since the merge there is
a new root in your branch. I should be rolling out the new plugin later
today, but it won't fix this ticket (or this sort of issue). In the long
run, these sorts of merge issues should disappear as all the old
repositories get merged.
--
Ticket URL: <http://trac.sagemath.org/ticket/15580#comment:30>
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.
