There is nothing wrong with merges 

* if you need them
* if the original branch is the first parent. 

Doing it the wrong way makes the history more difficult to understand, and 
we shouldn't teach or facilitate that antipattern.



On Saturday, May 31, 2014 2:35:30 PM UTC+1, Nathann Cohen wrote:
>
> Yo ! 
>
> >   If you want to edit the ticket branch (that is, add additional 
> >   commits) you cannot use `git trac try`. You must use `git trac 
> >   checkout` to get the actual ticket branch as a starting point. 
>
> Why can't you add commits after a merge ? I do this all the time O_o 
>
> Nathann 
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Reply via email to