Re: Branch management

[David Kastrup]

littlesincanada <address@hidden> writes:

> Hi Devs,
> It's a long time since I pushed any Lilypond dev work to my dev branch
> dev/rlittle. About 9 years to be precise. :o
> OK, time that situation changed.
>
> The only commit on that branch is a first pass at a Braille output
> option base. Things have moved on and I'm working on it some more, but
> the base on which it is based is soooo old. So old in fact that I can
> no longer build it. It seems that the build tools themselves have
> moved on.
>
> 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.

To a branch of public interest.  Even then, branches like our staging
branch are intended to be reset frequently.

And developer branches are up to the discretion of the developer.

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.

-- 
David Kastrup