lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Branch management


From: littlesincanada
Subject: Branch management
Date: Thu, 11 Aug 2016 20:58:55 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0

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.

So what I figure I need to do is revert the changes and apply an update that is current with master (which I have done locally, and it compiles and runs), taking into account how things have moved on but that still leaves my branch anchored 9 years into the past.

Any ideas how I should proceed?

Cheers,
Ralph



reply via email to

[Prev in Thread] Current Thread [Next in Thread]