Hi Nathann, On 2014-03-09, Nathann Cohen <[email protected]> wrote: > git checkout trac/develop # or whatever the name of develop is on your install > git checkout -b new_branch > git pull trac u/ncohen/whatever > > This creates an empty branch on develop, then merges the distant > branch into it, i.e. above develop.
Thank you! I was thinking about a different situation: I already have the new_branch, I want to merge it with an updated develop branch, and the result of the operation should still be called new_branch. Up to now, in the above situation, I would *not* merge new_branch into the updated develop and call the result again new_branch, since I was too often told that this is changing history, for some weird notion of history. Instead, I would merge the updated develop branch into new_branch, and push to trac if needed (otherwise do git reset --hard HEAD~). But this would mean to touch a lot of files, if new_branch is based on top of an old version. Fortunately there is ccache... Best regards, 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.
