On Wed, Dec 18, 2013 at 9:51 AM, Michael Orlitzky <mich...@orlitzky.com> wrote: > On 12/18/2013 11:59 AM, Jeroen Demeyer wrote: >> On 2013-12-18 08:24, Robert Bradshaw wrote: >>>> 7. But since the "u/johndoe/tracabcde" branch misses everything that went >>>> into Sage in between 6.1 and 6.2, I suppose the first thing I now should do >>>> is: >>>> >>>> git merge --no-edit 6.2 >>> >>> Yep. >> >> Didn't Volker say that merging is a bad idea? >> > > If there are no changes in 6.2 that affect your branch, you can get away > with a `git rebase 6.2` here.
But if you push this then the original author won't be able to cleanly pull your rebase. It gets worse if people are depending on this ticket for further development. However, if there are no changes in 6.2 that affect your ticket, I would say that you don't even have to merge & push the merge, just review the code and let the release manager do the merge. It will be tested after merging into main and again after merging into it's place in the commit queue. > Merges aren't bad, but "merge commits" are often pointless. They're the > commits you see that say something like "merged upstream branch foo." If > foo doesn't contain any changes that affect your branch, what you'd > really like to do is to replay your commits on top of the upstream > branch, so it looks like you made your changes on top of the new stuff. > A rebase will do that, but it isn't always possible. > > The most common way to wind up with a pointless merge commit is, or at > least used to be, when you had made local commits and then did a `git > pull`. If there were any changes upstream it would automatically create > a merge commit for you. A flag, `git pull --rebase` was added to avoid > it. I don't think this will affect sage too much though, since only one > person can work on a branch at a time. Rebaseing is a good idea before you publish a ticket, but once you do that (and there's any chance people have pulled from your branch) you should just merge. - Robert -- 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/groups/opt_out.
