On 12/18/2013 05:01 PM, Simon King wrote: > > Isn't rebasing even worse than an occasional merge commit? If I recall > correctly, gits claim that rebasing a published branch means to change > the history of the branch and is very evil.
You should try not to change the history of a public branch that people are working off of, because when they next attempt to push/pull, git won't know what to do. It should be safe here (in the OP's scenario), since you're creating and publishing a new branch. If I clone a branch that you're working on, I can't make changes and push it, because it lies under the u/SimonKing namespace. Instead I have to make a new branch, u/mjo/something and push that. Since the u/mjo/something branch never existed, it doesn't matter what I do -- no one is working off of it. On the other hand (this is not the OP's scenario), once I've made my branch based on yours (u/SimonKing/something), then you shouldn't rebase yours, because it might mess me up. -- 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.
