bug-lilypond
[Top][All Lists]
Advanced

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

Re: lilypond not working when compiled against guile-2.2


From: David Kastrup
Subject: Re: lilypond not working when compiled against guile-2.2
Date: Tue, 05 Jun 2018 10:56:04 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)

Thomas Morley <address@hidden> writes:

> 2018-06-05 4:14 GMT+02:00 Carl Sorensen <address@hidden>:
>>
>>
>> ´╗┐On 6/4/18, 6:13 PM, "Thomas Morley" <address@hidden> wrote:
>>
>>
>>     That said, in our git we have a 'guile-v2-work'-branch, but it's not
>>     up to date...
>>
>>     @David
>>     I think about updating this branch, it would be far easier to point
>>     interested people to this branch.
>>     Needed would be a rebase, probably with the need to solve
>>     merge-conflicts and I'd like to add some new patches of my own.
>>     What would be the git-syntax for it?
>>
>> First cut:
>>
>> git checkout guile-v2-work
>> git rebase master
>>
>> Solve any merge conflicts.
>>
>> Add in any patches you want to add in.
>>
>> Then you're all up to date.
>
> if I understand correctly, the above will work on my local copy of
> said branch, to get it public, the updates should be pushed to the
> public branch.
>
> For pushing usual patches to staging from a local branch I use:
> git push origin HEAD:staging
>
> How to adapt this?

Probably just

    git push

but you can probably do

    git push --dry-run

and ask on the devel list whether the output looks like you should try
for real.

-- 
David Kastrup



reply via email to

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