Re: [oll-user] Git workflow

[Urs L. <ul...@op...>]

Marc Sabatella <ma...@ou...> schrieb:
>On 1/10/2014 5:43 PM, Urs Liska wrote:
>> Somewhere there is a misconception, presumably on your side. What
>does 
>> Git remote -v tell you? When you add a remote this is only for the 
>> current repository. What repo do you think the name upstream is 
>> already used for?
>
>Aha!  "git remote -v" reports that upstream is defined as exactly what 
>it should be defined as.  Not sure if I accidentally did it twice, or
>if 
>the GitHub app did this for me when I asked to clone my fork,

That may well be

 but 
>anyhow, all is well.
>
>I'll issue the pull request right away, but I won't be working on this 
>further tonight anyhow.  Thanks for the help!

before you should do:

Git checkout 2-schumann-challenge
Git fetch upstream
Git rebase upstream/master
Git checkout musescore
Git rebase 2-schumann

(Everything with lowercase at the beginning)

Then make sure to open the request against openlilylib/2-schumann-challenge.

Good night.
Urs
>
>Marc


-- 
Urs Liska
openlilylib.org