> > IMO, a better practice is to merge in old branches to a branch based off > > develop. If you want to rebase, then run rebase. That way you never have > > old cruft and have to watch Sage do a massive rebuild of things with > only > > changed timestamps. For example > > > > $ git checkout -b branch_name develop > > $ git merge branch_name > > $ git rebase develop > > I am not sure if I understand that procedure correctly. Where does the > old branch comes into play? Should the second line perhaps be > $ git merge old_branch > ? > > Why would you rebase if old_branch merges cleanly into develop? > > And even if you abstain from rebasing: Assume you have local_old_branch > that is identical with remote_old_branch in the branch field of Trac > ticket > 12345. The purpose is to somehow merge it with the latest develop, and > according to your suggestion one does > $ git checkout -b new_branch_name develop > $ git merge local_old_branch > and then push new_branch_name to #12345. Would that mean to force-push? Or > would a normal push suffice? > > Personally, I never rebase on published branches because that overwrites history (although I will do this on my personal branches before I push them). However, if you do
$ git fetch trac old_branch:local_branch_name $ git checkout local_branch_name $ git merge develop you reset everything to the version that old_branch was at, so all of the timestamps get updates, and then the merge resets them again to the state of develop. So as far as make knows, you have just changed everything. Now if you follow the procedure with no rebasing, then you can do a normal push and the branch just picks up a merge commit. I also never have branches that are not based on develop. I make it a point to update all of my local branches in order to avoid accidentally switching versions. Best, Travis -- 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 https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
