On Tue, Aug 7, 2012 at 8:54 PM, Ondřej Čertík <[email protected]> wrote: > On Tue, Aug 7, 2012 at 7:21 PM, Aaron Meurer <[email protected]> wrote: >> IMHO, rebasing has too high of a potential of making the history not >> make sense even if you don't squash, because of the way that changes >> can be "rebased out" of commits. So I would recommend not rebasing at >> all, if it's not necessary. > > Are you talking about rebasing in the step 1), or step 4) or step 6)? > Are you suggesting to use "merge" only (if there are conflicts)?
I guess the step 1 rebase is OK, because that's when you actually split up the commits. I personally don't do it that way, but I think it works. But otherwise, I would avoid it. Actually, I guess the big thing is rebasing over master. If you just rebase over a commit that's already i your branch, it shouldn't happen there either (but again, it's usually not necessary). > >> >> I definitely agree that it's a good idea to start a PR as soon as you >> have a single commit, so that people can start to review it and test >> it as you work. You can just say "work in progress" or "not ready to >> merge" in the OP if it needs to wait for all the commits, and then >> remove it when it's done. > > I think it's becoming standard to use [WIP] as the first thing in the > title of the pull request, > I've seen it couple times in other projects (wip = work in progress). That way > you can easily see it and not even click on the pull request unless > you are interested. > > Ondrej > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/sympy?hl=en. > -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
