Hi Volker, On 2014-03-10, Volker Braun <[email protected]> wrote: > Both just add a merge commit on top of my_branch, so history is preserved.
Really? That's a relief... > The customary (and hence slightly easier to understand later on) option is > the first one, which also requires fewer git commands. > That's to say, you recommend that I keep doing this: >> Instead, I would merge the updated develop branch into >> new_branch, and push to trac if needed (otherwise do git reset --hard >> HEAD~). Thanks, Simon -- You received this message because you are subscribed to the Google Groups "sage-release" 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-release. For more options, visit https://groups.google.com/d/optout.
