#14990: Implement algebraic closures of finite fields
-------------------------------------+-------------------------------------
Reporter: pbruin | Owner:
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-5.13
Component: algebra | Resolution:
Keywords: finite field | Merged in:
algebraic closure | Reviewers:
Authors: Peter Bruin | Work issues:
Report Upstream: N/A | Commit:
Branch: u/pbruin/14990 | 4265b4fe176d32b3bc7cbc616f8f0964e273ecdb
Dependencies: #14958, #13214 | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by defeo):
> Although if I read the `git-rebase` man page correctly, merging our
branches will now create even more duplicates because of my `rebase`.
What is the best solution for this?
What do you mean by "duplicate commits"?
It's not a big deal for me, I can easily rebase my branch on yours. It's
not meant to enter Sage anyway: it's just some experiments.
But it might be a problem for Vincent, if you still want to share work. If
you want to go back in time, you can do something like this (make sure you
have no uncommited work)
{{{
git reset --hard 5fe4189
git cherry-pick 4265b4f
git merge master
git push -f
}}}
assuming the only commit that really did something was the last one,
4265b4f.
Anyway, as I said, I don't care. If this history is better for you, it's
ok for me. I'll just rebase on top of your new history. Just try this if
Vincent needs it.
--
Ticket URL: <http://trac.sagemath.org/ticket/14990#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.
