Re: [oll-user] Git workflow

[Joshua N. <jos...@gm...>]

How in the WORLD do I create folders and add files to GitHub? I have no
idea what to do...

IC,

Josh


On Sat, Jan 11, 2014 at 1:41 PM, Urs Liska <ul...@op...> wrote:

> Am Samstag, den 11.01.2014, 10:09 -0700 schrieb Marc Sabatella:
> > On 1/10/2014 5:56 PM, Urs Liska wrote:
> > > 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.
> >
> > This is *almost* but not quite what I figured out on my own.  In the
> > third step above, I did the rebase against upstream/2-schumann-challenge
> > instead of upstream/master - basically, I did a global replace of
> > everywhere I normally would have used "master", changing it to
> > 2-schumann-challenge.  And I assume your fifth step above is a typo and
> > should have been a 2-schumann-challenge.
> >
> > I'm still green enough with Git to not be able to figure out for myself
> > what the difference between "git rebase upstream/master" and "git rebase
> > upstream/2-schumann-challenge" is in this context.  Did I screw things
> > up badly enough that I need to redo all this, or if the pull request
> > usable as is?
> >
> > Anyhow, this whole series of step - including instructions on how to
> > open a PR against a branch (since it seems to default to master) should
> > probably go in the workflow document.
> >
> > Marc
> >
>
> I will look into this in detail later tonight.
>
>
>
>
> ------------------------------------------------------------------------------
> CenturyLink Cloud: The Leader in Enterprise Cloud Services.
> Learn Why More Businesses Are Choosing CenturyLink Cloud For
> Critical Workloads, Development Environments & Everything In Between.
> Get a Quote or Start a Free Trial Today.
>
> http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
> _______________________________________________
> openlilylib-user mailing list
> ope...@li...
> https://lists.sourceforge.net/lists/listinfo/openlilylib-user
>
-------------- next part --------------
An HTML attachment was scrubbed...