#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:46 vbraun]:
> 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 ;-)
As far as I know, my local repository contains nothing that depends on
this ticket. So, how can there be a conflict? I am not talking about
conflicts that are just artefacts of how git works.
> > 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.
If I have a local branch associated with this ticket, and if I pull from
this ticket and there are merge conflicts with my local branch, I'd expect
that my old local branch (ticket/15367) be preserved and a new local
branch (say, ticket/15367-1) be created that is equal to the branch
forced-pushed by Nils. This should be automatically done by either the dev
script or by git. And then, I can still decide whether I want to delete my
old branch or merge the new and the old branch, or I can explain to Nils
why I don't like his new branch and switch back to the old one.
In contrast, you say that in the new workflow I have to decide whether or
not to delete my old branch, ''before'' I pull from Nils' changes. Why?
This approach seems plain wrong to me.
I guess this is a theoretical discussion that belongs to the sage-git
list. Since I don't see stuff depend on this ticket (yet), I did as you
suggested.
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:47>
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.
