Re: Branch management

2016-08-12 Thread Ralph Little
Hi, > If, as you say, you only have one commit on your branch you can also > just copy that commit to a new branch and later delete the old branch: git > checkout master > git checkout -b my/new/branch > git cherry-pick commit-id-from-old-branch ... later ... > git branch -D dev/rlittle > git push

Re: Branch management

2016-08-11 Thread Urs Liska
Am 12.08.2016 um 07:21 schrieb littlesincanada: > Hi, > > On 11/08/16 21:18, David Kastrup wrote: >> littlesincanada 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 t

Re: Branch management

2016-08-11 Thread littlesincanada
Hi, On 11/08/16 21:18, David Kastrup wrote: littlesincanada 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 longe

Re: Branch management

2016-08-11 Thread David Kastrup
littlesincanada 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

Branch management

2016-08-11 Thread littlesincanada
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, bu