Always use merge instead of rebase for branches that you have already published on trac.
If you want to violate that rule then you have to force push (git push -f). On Saturday, May 10, 2014 1:10:42 AM UTC+2, Andrey Novoseltsev wrote: > > I've rebased a branch on top of 6.2, which went fine (branch just adds a > file), but then I couldn't push it via git push > -- 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/d/optout.
