Le mercredi 06 avril 2011 à 23:30 -0700, Ondrej Certik a écrit : > On Wed, Apr 6, 2011 at 11:10 PM, Chris Smith <smi...@gmail.com> wrote: > > Ondrej Certik wrote: > > > >> I don't think we should merge things into master, if it means making > >> it more difficult to merge the branch. We should do whatever it takes > >> to get this in, using our manpower. > > > > I'm not following the vocabulary nuances here. What do you mean by not > > "merg[ing] things into master"? Do you mean merge vs rebase and commit? > > > My fault, I was not clear, sorry. I meant cherry-picking things into > the master, and leaving the rest of the branch for somebody else to > painfully rebase and update (if that's the case). > But we aren't going to do that, since the branch won't be rebased and merging a branch with commits extracted from it should be easy. So what's your objection?
-- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sympy@googlegroups.com. To unsubscribe from this group, send email to sympy+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.