On Friday, 9 May 2014 17:37:02 UTC-6, Michael Orlitzky wrote: > > On 05/09/2014 07:10 PM, Andrey Novoseltsev wrote: > > Hello, > > > > 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 ... or git trac push > > with git insisting that I have to pull. While that worked, it > > automatically created an empty (=no files have changed) merge commit > > listing all my previous commits in the message. So - what have I done > > wrong and what should I do to just have real commits on top of 6.2? The > > ticket in question is http://trac.sagemath.org/ticket/14288 > > Usually you want `git pull --rebase` instead of just `git pull`. You can > `git reset` back to the point before you pulled, and then do the pull > with rebase. Make a copy before the `git reset` just in case. > > I can reset locally, but git pull -rebase brings the merge commit back...
-- 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.
