On May 30, 2013 6:32 PM, "Paul Smith" <p...@mad-scientist.net>

> However, I've already pushed my branch to master.  I know rebasing stuff
> you've already pushed is considered a no-no in general, but I can't
> avoid it.  Does anyone have suggestions for how to make this work
> better?  Should I be rebasing to a brand new branch, then merge that to
> master?  Just rebase directly to master?  None of the above?  Something
> else entirely?

I don't understand why you don't do all this cleanup *before* you merge
into master.

There's no problem with rebasing published history per se, only with
rebasing history that someone else might have pulled into their own
history.  You can rebase to your heart's content as long as you're on your
own branch, even of it does have to live on a remote server.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to