lilypond-devel
[Top][All Lists]
Advanced

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

Re: Python hacker emergency on git-cl


From: Thomas Morley
Subject: Re: Python hacker emergency on git-cl
Date: Sun, 2 Dec 2012 14:55:39 +0100

2012/12/2 David Kastrup <address@hidden>:
> Thomas Morley <address@hidden> writes:
>
>> 2012/12/2 David Kastrup <address@hidden>:
>>> David Kastrup <address@hidden> writes:
>>>
>>>> Do
>>>>
>>>> git pull -r
>>>>
>>>> first to get your patch up-to-date.
>>>
>>> To get your git-cl repository up-to-date, sorry.
>>>
>>> --
>>> David Kastrup
>>>
>>>
>>> _______________________________________________
>>> lilypond-devel mailing list
>>> address@hidden
>>> https://lists.gnu.org/mailman/listinfo/lilypond-devel
>>
>> Tried to do what you suggested.
>> Without success, with uploading the patch.
>> The only difference:
>>
>> address@hidden ~/lilypond-git (dev/local_working|AM)$ git pull -r
>> It looks like git-am is in progress. Cannot rebase.
>
> Well, then a failed git-am is still unfinished.  So first do
>
> git am --abort
>
> and then try pulling again.
>
> --
> David Kastrup

git am --abort works so far that git pull -r works again.
But I can't upload anything.
For now I give up.



reply via email to

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