#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 vbraun):
Nils rewrote history with the forced pushs (bad), so some of the code in
Simon's branch conflicts as it is on a different history.
Replying to [comment:45 SimonKing]:
> Once more, my impression is that the git workflow helps us solve
problems that we didn't have without git
Noticing conflicts is not a problem when you manually copy patches,
correct. However, **not** noticing conflicts is a problem ;-)
> So, how can I get your code?
If you haven't made any commits that you want to keep: delete your current
branch (`git branch -D my_branch`) and checkout a fresh copy. If you have
made commits, you have to rebase (`git rebase` or `git cherrypick`, for
example) them on top of Nils' rewritten history.
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:46>
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.
