#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):
Once more, my impression is that the git workflow helps us solve problems
that we didn't have without git.
That's to say: `sage --dev checkout --ticket=15367` only brought me to my
local branch for this ticket. `sage --dev pull` resulted in
{{{
Merging the remote branch "u/nbruin/ticket/15367" into the local branch
"ticket/15367".
Automatic merge failed, there are conflicting commits.
Auto-merging src/sage/structure/coerce_dict.pyx
CONFLICT (content): Merge conflict in src/sage/structure/coerce_dict.pyx
Please edit the affected files to resolve the conflicts. When you are
finished, your resolution will be commited.
Finished? [ok/Abort] A
}}}
So, how can I get your code?
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:45>
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.
