#18223: new categories for cartesian products with orders
-------------------------------------+-------------------------------------
       Reporter:  dkrenn             |        Owner:
           Type:  enhancement        |       Status:  needs_review
       Priority:  major              |    Milestone:  sage-6.7
      Component:  categories         |   Resolution:
       Keywords:  sd67               |    Merged in:
        Authors:                     |    Reviewers:
Report Upstream:  N/A                |  Work issues:
         Branch:                     |       Commit:
  public/ticket/18223                |  1013cca1a33877e3ba52af111324be937ec19f58
   Dependencies:                     |     Stopgaps:
-------------------------------------+-------------------------------------

Comment (by dkrenn):

 Replying to [comment:6 chapoton]:
 > This is forced to me by git, even when the merge is trivial. I work like
 that:
 >
 > 1) I copy the develop branch into say branch18223
 >
 > 2) I pull the branch from trac, sitting on branch18223
 >
 > 3) git forces me to do a merge commit, often a trivial one.

 http://www.sagemath.org/doc/developer/manual_git.html#merging-and-rebasing
 says at the end of the section:

     [...] do nothing unless necessary: it is perfectly fine for your
 branch to be behind master [...]

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