On Thursday, March 20, 2014 12:57:55 PM UTC-4, kcrisman wrote: > > 6) Now I want to use sage -dev merge to merge my branch so it's ready to >>> be reviewed >>> >> >> No, you do not need to merge anything. If there is a merge failure later >> on the reviewer or release manager will let you know. >> > > Hmm, that is true, but then what is the "right" thing to do to fix the > failure? >
IF there ends up being a conflict with the current development branch later on, then you merge that development branch into your ticket branch. I.e. while having your ticket branch checked out you'd run git fetch trac develop git merge FETCH_HEAD Or just "git merge develop" if your local develop branch is up-to-date. -- 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 [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
