littlesincanada <address@hidden> writes:
On the face of it, a rebase is the obvious solution, but I'm told that
it's a cardinal sin to rebase commits that have already been pushed.
So forget about that cardinal sin and just rebase. You'll find that
you'll no longer be able to push the rebased branch since it is not a
fast forward. So you first need to delete and then repush it, like
git push origin :refs/heads/dev/rlittle
git push origin HEAD:refs/heads/dev/rlittle
Of course, make very sure that your current HEAD is in the state you
want to see remotely before doing the deletion.