#16333: Game Theory: build capacity to use gambit to solve Normal Form Games.
-------------------------------------+-------------------------------------
Reporter: vinceknight | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.4
Component: game theory | Resolution:
Keywords: Game Theory, | Merged in:
Normal Form Games | Reviewers:
Authors: | Work issues:
Report Upstream: N/A | Commit:
Branch: | 9e1c1049aeb5bca2bee1188d29bc14d026fcb999
u/vinceknight/gambit_integration | Stopgaps:
Dependencies: #16466 |
-------------------------------------+-------------------------------------
Comment (by vinceknight):
Replying to [comment:38 ncohen]:
> Hello Vince ! It would be really cool if you made your branch a bit more
'reviewer-friendly'. Right now it seems to follow the development history,
but you want this to be re-read by somebody and it would be nice to not
have a commit that fixes a bug introduced in a previous commit.
Yeah, sorry: this was the subject of a long discussion on another
thread... Will fix it now (or at least try to: rebase is a thing I can't
pretend to understand). :)
>
> With git, you can very easily merge commits together, as part of the
rebase command. Try something like that:
>
> - Checkout your branch, and type 'git checkout -b rebased_version'.
This, to make sure that we do not touch your old branch so nothing can go
wrong.
> - 'git rebase -i develop'. This will 'replay' all your commits on top of
the latest develop version. It will open a text editor, and you will see
how easy it is to merge two commits, or reorder them.
>
> At the end of this procedure, the branch `rebased_version` will be on
top of the latest develop version, and its history should be cleaner. You
can call 'git rebase -i develop' several times if needed.
>
> Hope that will help.
Yeah that looks really helpful, thanks!
>
> Nathann
--
Ticket URL: <http://trac.sagemath.org/ticket/16333#comment:40>
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/d/optout.
