#16331: Game Theory: Build capacity to solve matching games in to Sage.
-------------------------------------+-------------------------------------
       Reporter:  vinceknight        |        Owner:
           Type:  enhancement        |       Status:  needs_review
       Priority:  major              |    Milestone:  sage-6.4
      Component:  game theory        |   Resolution:
       Keywords:  Game Theory,       |    Merged in:
  Matching Games,                    |    Reviewers:
        Authors:                     |  Work issues:
Report Upstream:  N/A                |       Commit:
         Branch:                     |  aae25ce141378189f73400f771951139aef304b3
  
u/vinceknight/game_theory__build_capacity_to_solve_matching_games_in_to_sage_|  
   Stopgaps:
   Dependencies:                     |
-------------------------------------+-------------------------------------

Comment (by tscrim):

 Replying to [comment:76 vinceknight]:
 > Replying to [comment:74 tscrim]:
 > > I'd just delete them and check (on a new temp branch) that once you
 merge in #16466, the spkg files are there (which I believe it should be
 okay from looking at the commit history).
 >
 > Cool, thanks, I've deleted the files and pushed. Sadly when I merged
 #16466 into a temp branch I got some merge conflicts (saying that the
 files were deleted in one branch).
 >
 > If things are 'ok' in this branch I'd be tempted to leave it as is and
 worry about #16466 which we should probably just re-branch from develop?
 If I'm misunderstanding a future mess that might appear please let me know
 and I can just 're-branch' from develop for #16331...

 Well, at least it doesn't do it silently. So if we forget about it, the
 merge will remind us (and the conflict is easy enough to handle). I'll
 make another look-through today.

--
Ticket URL: <http://trac.sagemath.org/ticket/16331#comment:77>
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.

Reply via email to