Re: [oll-user] Git workflow

[Marc S. <ma...@ou...>]

On 1/10/2014 2:58 PM, Urs Liska wrote:
> Are we supposed to be forking branches rather than the master?
> Hm, just to be precise: you're not forking a branch but a repository.
> That is: you have forked the complete repository, which contains all
> branches.
> Maybe that's what you meant, I just think these issues have to be clear.

Yes, thank you.  At some level I do understand forking is the whole 
repo, but while I'd like to say this was a slip of the tongue, the 
reality is, I have to slow down and think clearly with git.

> Now to the branching strategy.

Thanks, that made perfect sense.

One thing: I already use "upstream" as an alias for the main MuseScore 
source repo.  I would have thought Git would be smart enough to make 
these aliases repo-specific, but apparently not - it complained 
"upstream" was already in use.  Or am I doing something wrong?

Marc