#15367: Empty lists while creating parents
-------------------------------------+-------------------------------------
Reporter: roed | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-5.13
Component: coercion | Resolution:
Keywords: | Merged in:
Authors: Nils Bruin | Reviewers: Simon King
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/nbruin/ticket/15367 | 719cdec176875685142039dce297a7fd8ae4143b
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by SimonKing):
Replying to [comment:48 nbruin]:
> It seems that `sage --dev` has a concept of linking a branch with a trac
ticket, which is convenient. In your case, you already had a branch linked
with this ticket, so naturally it tried to merge my branch with your local
one and due to the rebase there really WAS a conflict.
AFAIK, git knows that this was a forced push. So, the dev script should at
least offer a "forced pull".
Anyway, this ticket is not about annoyances and hold-ups caused by the
switch to the new workflow.
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:51>
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.
