openlilylib-user Mailing List for openLilyLib (Page 3)
Resources for LilyPond and LaTeX users writing (about) music
Status: Alpha
Brought to you by:
u-li-1973
You can subscribe to this list here.
2013 |
Jan
|
Feb
|
Mar
(45) |
Apr
(38) |
May
|
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(10) |
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2014 |
Jan
(164) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Marc S. <ma...@ou...> - 2014-01-12 17:21:04
|
I'd say the details of whether git stores changes just as diffs or whether or stores complete files are irrelevant. I mean, sure, in a large project, it's 10,000 times more efficient to just store diffs, considering that a commit in git isn't just of a single file - it's a snapshot of the entire repo, most of which probably has not changed. But from a user point of view, if we pretended storage was unlimited there would be no difference. The point is, git (or any version control system) isn't just a place to store files - it's a way of tracing the entire history of how the files got to be in the state they are in, as well as a way for multiple people to work on the same set of files without constantly stepping on each others' toes. So if there is more added complexity to the process as compared to just copying files into a big disk somewhere, that's a) to be expected and b) worth the small price. Right now, git may seem like a huge inscrutable mystery, but it's actually quite simple and extraordinarily powerful - if you take the time to learn the basics. There will still be complexities to be sure, especially when it comes to merging together work from multiple contributors - that is an inherently hard problem to solve, and it can never be 100% transparent. But it is absolutely worth spending the time it takes to read through a tutorial or two to get a feel for the big picture, rather than just trying to memorize a seemingly arcane series of commands. Marc |
From: David W. <da...@mu...> - 2014-01-12 16:46:55
|
From: Phil Holmes > Urs is being somewhat pedantic. push copies your changes to the server. There's a difference between what I just said and what you said. Since git is a revision control system, it really works on the basis of changes in revisions, rather than uploading files. However, with files where it can't track change (i.e. binary files), the only change it knows about is that there's a completely new version of the file. Therefore the whole of the file gets pushed to the server, so in ftp terms, it would be uploaded. > It's easier to consider this in the context of text files, where if you change a single line, all that is pushed to github is a message saying "hey - there's a new line 4 - here it is".< Thanks! I had that impression originally, and I was wondering why there were sequences of files (and I just copied others with my v1, v2 etc.) All (well this bit <g>) is now clear. Anecdote: back in the late 1980s when I worked for the UK Atomic Energy Authority's Safety and Reliability Directorate, they got "Quality Assurance" in a big way. The QA procedures demanded we back up differences between our files from one version of the software were developing to the next. I had no experience of this kind of incremental back-up, and distrusted it instinctively, as a corruption error in one back-up would, as far as I could see, mean that the entire chain was unrecoverable. However there was some new technology: WORM drives. With one of these we could back up our entire project every time, with no danger of running out of disk space. Despite regularly backing up all projects, I was landed on hard by our internal QA auditors for being non-compliant. In vain I asked how we could be non-compliant if I could recover any version of the software on demand; in vain I pointed out that if they really wanted to *see* differences from one version to the next, Mr Gates provided a very nice file-compare utility; and in vain I explained that our backup was far more fail-safe. I was in deep trouble. Which of course I ignored. The external QA auditors, when they arrived, were far more intelligent, and caused me no problems whatsoever. Dave David Webber Mozart Music Software http://www.mozart.co.uk/ |
From: Phil H. <ma...@ph...> - 2014-01-12 16:16:32
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: "oll-user" <ope...@li...> Sent: Sunday, January 12, 2014 4:00 PM Subject: Re: [oll-user] Fw: Git workflow > From: Urs Liska > >> Yes, Git does things that are simply out of reach for any file based >> approach. But it can't do them on binary files. > I also noticed that some participants still talk of "uploading" ,and that > shows that you're still on the wrong track.< > > ??? > > Are you saying that "git push" does not copy my file to the GitHub server? Urs is being somewhat pedantic. push copies your changes to the server. There's a difference between what I just said and what you said. Since git is a revision control system, it really works on the basis of changes in revisions, rather than uploading files. However, with files where it can't track change (i.e. binary files), the only change it knows about is that there's a completely new version of the file. Therefore the whole of the file gets pushed to the server, so in ftp terms, it would be uploaded. It's easier to consider this in the context of text files, where if you change a single line, all that is pushed to github is a message saying "hey - there's a new line 4 - here it is". > The alternative AFAICT would be to put a reference (of some kind) to the > source file on my computer there, so that when someone else wants to look > at > it, it gets uploaded from me and downloaded to them. Is that what > happens? > (I find the idea rather frightening.) See above. >> And yes, this clearly indicates that we're having an issue with the >> concept of all this. >> I'm not sure how to deal with it, and I can only say: for those of you >> who >> use "versionable" (i.e. text) files this effort will surely pay off on >> the >> long run. > > Possibly. > > Dave If you _want_ to work out why Urs believes this, then http://lilypondblog.org/2014/01/why-use-version-control-for-engraving-scores/ may be of help. Otherwise, stick with my recipe for now. -- Phil Holmes |
From: Urs L. <ul...@op...> - 2014-01-12 16:09:44
|
David Webber <da...@mu...> schrieb: >From: Urs Liska > >> Yes, Git does things that are simply out of reach for any file based >> approach. But it can't do them on binary files. >I also noticed that some participants still talk of "uploading" ,and >that >shows that you're still on the wrong track.< > >??? > >Are you saying that "git push" does not copy my file to the GitHub >server? It _does_ upload it to the server. But the fundamental concept isn' about. Moving files around but about tracking changes between file versions. Sorry, the recording session's going to continue ... Urs > >The alternative AFAICT would be to put a reference (of some kind) to >the >source file on my computer there, so that when someone else wants to >look at >it, it gets uploaded from me and downloaded to them. Is that what >happens? >(I find the idea rather frightening.) > >> And yes, this clearly indicates that we're having an issue with the >> concept of all this. >> I'm not sure how to deal with it, and I can only say: for those of >you who >> use "versionable" (i.e. text) files this effort will surely pay off >on the >> long run. > >Possibly. > >Dave > >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > > >------------------------------------------------------------------------------ >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 -- Urs Liska openlilylib.org |
From: Urs L. <ul...@op...> - 2014-01-12 16:09:35
|
David Webber <da...@mu...> schrieb: >From: Urs Liska > >> Yes, Git does things that are simply out of reach for any file based >> approach. But it can't do them on binary files. >I also noticed that some participants still talk of "uploading" ,and >that >shows that you're still on the wrong track.< > >??? > >Are you saying that "git push" does not copy my file to the GitHub >server? It _does_ upload it to the server. But the fundamental concept isn' about. Moving files around but about tracking changes between file versions. Sorry, the recording session's going to continue ... Urs > >The alternative AFAICT would be to put a reference (of some kind) to >the >source file on my computer there, so that when someone else wants to >look at >it, it gets uploaded from me and downloaded to them. Is that what >happens? >(I find the idea rather frightening.) > >> And yes, this clearly indicates that we're having an issue with the >> concept of all this. >> I'm not sure how to deal with it, and I can only say: for those of >you who >> use "versionable" (i.e. text) files this effort will surely pay off >on the >> long run. > >Possibly. > >Dave > >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > > >------------------------------------------------------------------------------ >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 -- Urs Liska openlilylib.org -- Urs Liska openlilylib.org |
From: David W. <da...@mu...> - 2014-01-12 16:00:45
|
From: Urs Liska > Yes, Git does things that are simply out of reach for any file based > approach. But it can't do them on binary files. I also noticed that some participants still talk of "uploading" ,and that shows that you're still on the wrong track.< ??? Are you saying that "git push" does not copy my file to the GitHub server? The alternative AFAICT would be to put a reference (of some kind) to the source file on my computer there, so that when someone else wants to look at it, it gets uploaded from me and downloaded to them. Is that what happens? (I find the idea rather frightening.) > And yes, this clearly indicates that we're having an issue with the > concept of all this. > I'm not sure how to deal with it, and I can only say: for those of you who > use "versionable" (i.e. text) files this effort will surely pay off on the > long run. Possibly. Dave David Webber Mozart Music Software http://www.mozart.co.uk/ |
From: Urs L. <ul...@op...> - 2014-01-12 15:56:58
|
David Webber <da...@mu...> schrieb: >Just noticed, by looking at Marc's Muse Score results, that I didn't >complete the final bar correctly. This was because I printed the >original >image on my A4 printer it lost all the bar lines down the RHS, and I >didn't >even guess that this was the end of the piece, though I suppose I >should >have done, what with the great plonk on the Fm tonic at the end :-) >[Odd, >though, that it ends on an incomplete bar, when there's no anacrusis at >the >start. Still ours is not to wonder why.] In carnaval the pieces are manyfold and mysteriously intertwined ,forming larger formal structures, replacing the Beethoven style development technique. Such incomplete bars are part of that - and probably also expression of Schumann's humour. > >So just to finish the job neatly - it's at: > ><https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v8.pdf> > >Dave > >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > > >-----Original Message----- >From: David Webber >Sent: Sunday, January 12, 2014 11:59 AM >To: oll-user >Subject: [oll-user] Challenge 2 - Mozart > >OK, I’ve had a go at challenge 2, and this time I’ve tried to order >operations as in the instructions! > >What I did is described, I think, at > ><https://github.com/MozartSoftware/engraving-challenges/tree/master/challenge02-schumann/Mozart/README.md> > >and the successive stages of score completion are *possibly* at > >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v1.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v2.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v3.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v4.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v5.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v6.pdf >https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v7.pdf > >I just followed Phil’s instructions to upload them but I’ve really no >idea >where they’ve gone or what that ‘blob/master’ is doing in the middle of >the >name > >Anyway, any comments gratefully received! > >Dave >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > >-------------- next part -------------- >An HTML attachment was scrubbed... >-------------- next part -------------- >A non-text attachment was scrubbed... >Name: not available >Type: image/png >Size: 1090 bytes >Desc: not available >------------------------------------------------------------------------------ >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 > > >------------------------------------------------------------------------------ >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 -- Urs Liska openlilylib.org |
From: David W. <da...@mu...> - 2014-01-12 15:54:03
|
Just noticed, by looking at Marc's Muse Score results, that I didn't complete the final bar correctly. This was because I printed the original image on my A4 printer it lost all the bar lines down the RHS, and I didn't even guess that this was the end of the piece, though I suppose I should have done, what with the great plonk on the Fm tonic at the end :-) [Odd, though, that it ends on an incomplete bar, when there's no anacrusis at the start. Still ours is not to wonder why.] So just to finish the job neatly - it's at: <https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v8.pdf> Dave David Webber Mozart Music Software http://www.mozart.co.uk/ -----Original Message----- From: David Webber Sent: Sunday, January 12, 2014 11:59 AM To: oll-user Subject: [oll-user] Challenge 2 - Mozart OK, I’ve had a go at challenge 2, and this time I’ve tried to order operations as in the instructions! What I did is described, I think, at <https://github.com/MozartSoftware/engraving-challenges/tree/master/challenge02-schumann/Mozart/README.md> and the successive stages of score completion are *possibly* at https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v1.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v2.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v3.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v4.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v5.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v6.pdf https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v7.pdf I just followed Phil’s instructions to upload them but I’ve really no idea where they’ve gone or what that ‘blob/master’ is doing in the middle of the name Anyway, any comments gratefully received! Dave David Webber Mozart Music Software http://www.mozart.co.uk/ -------------- next part -------------- An HTML attachment was scrubbed... -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: image/png Size: 1090 bytes Desc: not available ------------------------------------------------------------------------------ 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 |
From: Urs L. <ul...@op...> - 2014-01-12 15:41:22
|
David Webber <da...@mu...> schrieb: >From: Phil Holmes > >> Alternatively, there is a long thread between David Webber and >myself: in >this I talk him through using git, from not having it installed to >successfully updating github. If you follow those steps, you should be >OK.< > >I found it immensely useful. > >I'm still lost with GitHub but at least I can accomplish that one task, >even >though I don't know what I'm doing. I suspect I'm not alone in finding >GitHup pretty much completely impenetrable, as almost all of the >discussion >here so far is about how to use GitHub, and almost none of it about >music >engraving :-( > >[As a simple minded Windows devotee, I'm used to opening a 'File >Explorer' >window on my local file system, and another on >ftp://this-that-or-the-other/ >and then just dragging files from one to the other to upload them. >I'm >sure GitHub must do other things, but it seems monumental in its >complexity >and opacity by comparison!] Yes, Git does things that are simply out of reach for any file based approach. But it can't do them on binary files. I also noticed that some participants still talk of "uploading" ,and that shows that you're still on the wrong track. And yes, this clearly indicates that we're having an issue with the concept of all this. I'm not sure how to deal with it, and I can only say: for those of you who use "versionable" (i.e. text) files this effort will surely pay off on the long run. Best Urs > >Dave > >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > > >------------------------------------------------------------------------------ >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 -- Urs Liska openlilylib.org |
From: David W. <da...@mu...> - 2014-01-12 14:58:17
|
From: Phil Holmes > Alternatively, there is a long thread between David Webber and myself: in this I talk him through using git, from not having it installed to successfully updating github. If you follow those steps, you should be OK.< I found it immensely useful. I'm still lost with GitHub but at least I can accomplish that one task, even though I don't know what I'm doing. I suspect I'm not alone in finding GitHup pretty much completely impenetrable, as almost all of the discussion here so far is about how to use GitHub, and almost none of it about music engraving :-( [As a simple minded Windows devotee, I'm used to opening a 'File Explorer' window on my local file system, and another on ftp://this-that-or-the-other/ and then just dragging files from one to the other to upload them. I'm sure GitHub must do other things, but it seems monumental in its complexity and opacity by comparison!] Dave David Webber Mozart Music Software http://www.mozart.co.uk/ |
From: Janek W. <lem...@gm...> - 2014-01-12 12:21:22
|
from a quick look: very interesting, thanks! 2014/1/12 David Webber <da...@mu...> > OK, I’ve had a go at challenge 2, and this time I’ve tried to order > operations as in the instructions! > > What I did is described, I think, at > > < > https://github.com/MozartSoftware/engraving-challenges/tree/master/challenge02-schumann/Mozart/README.md > > > > and the successive stages of score completion are *possibly* at > > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v1.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v2.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v3.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v4.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v5.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v6.pdf > > https://github.com/MozartSoftware/engraving-challenges/blob/master/challenge02-schumann/Mozart/MozartChallenge02-v7.pdf > > I just followed Phil’s instructions to upload them but I’ve really no idea > where they’ve gone or what that ‘blob/master’ is doing in the middle of the > name > > Anyway, any comments gratefully received! > > Dave > David Webber > Mozart Music Software > http://www.mozart.co.uk/ > > -------------- next part -------------- > An HTML attachment was scrubbed... > -------------- next part -------------- > A non-text attachment was scrubbed... > Name: not available > Type: image/png > Size: 1090 bytes > Desc: not available > > ------------------------------------------------------------------------------ > 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... |
From: Phil H. <ma...@ph...> - 2014-01-12 10:35:12
|
----- Original Message ----- From: "Marc Sabatella" <ma...@ou...> To: "Joshua Nichols" <jos...@gm...> Cc: "oll-user" <ope...@li...> Sent: Sunday, January 12, 2014 7:25 AM Subject: Re: [oll-user] Git workflow > Again, did you read my previous message where I laid out the basics? It > kind of sounds to me like you never actually cloned you repo to your > computer, so now you're just trying to push random files from any old > folder to your fork. It doesn't work that way. You have to clone your fork > to your local computer. That local repo on your computer is where you do > all your work. You have to be in your local cloned repo when you do > anything at all.— > Marc Sabatella Alternatively, there is a long thread between David Webber and myself: in this I talk him through using git, from not having it installed to successfully updating github. If you follow those steps, you should be OK. -- Phil Holmes |
From: Janek W. <lem...@gm...> - 2014-01-12 08:58:44
|
A very nice explanation indeed! Janek 2014/1/11 Marc Sabatella <ma...@ou...> > I'd like to step back and say a few things about the "big picture" > here. There are any number of "Git for dummies" tutorials out there > that you should should probably spend some time with, but having gone > through this pain myself recently with MuseScore, I can tell you the > devil is as likely to be in the details as in the concepts, because > every project structures things differently. > > Ideally, we'd all come to this (or any project) with a basic handle on > how Git works from the various tutorials that float around out there, > and the project would provide a "Git workflow" document that detailed > the specifics in a manner that would be clear enough to anyone with a > basic familiarity with Git. I think the current Git workflow document > we have here is a start, but doesn't go far enough, so maybe we need to > work on that. > > First, though, here's my bare bones and probably a bit naive nutshell > description of Git as it applies to GitHub-based projects specifically: > > A project has a main repository (repo) stored on GitHub that is the one > we are referring to as "upstream". This one you will *read* from (via > "git fetch upstream") whenever you need to get updated files contributed > by others. You will never probably write to this directly. > > When you first join a project, you start by creating a "fork" of that > repo, which creates your own personal copy of that upstream. Your fork - > which we are calling "origin" - is *also* stored on GitHub, and this is > what you will *write* to (via "git push") when you want to make your > work available to others. After pushing to your fork, you then issue a > "pull request" to the owner of the upstream repo that says "I have > pushed changes to my fork, please merge them into the upstream repo". > That is how your changes become available to others, and how their > changes become available to you - by being merged into the upstream repo. > > All of this is on GitHub. You will work, of course, on your own > computer. So you do a "git clone" of your fork, which creates a local > copy of everything. This is your own personal sandbox; you play with > these files however you like, including adding new ones. Every so often, > you decide things are at a state where you want to take a snapshot of > your current sandbox. You do this via "git commit". After one or more > of these commits, you might decide you are at a point where you feel > these should be written to your fork on GitHub, so you do as "git > push". After one or more of these pushes, you might decide your work is > ready to be shared with others, so you issue a "pull request" (that is > done on GitHub). Every so often, you will also decide it would be good > to grab the work others have been contributing. So you do a "git fetch > upstream". Because of the details of how git manages version control, > you have to also do a "git rebase" to fully incorporate their changes > into your sandbox (this is the step hardest to fully grasp, I find). At > that point, you can in principle continue working, do more commits, more > pushes, and pull requests, and the cycle continues. > > That's the overall flow of this and other projects that use GitHub. When > you read the various Git tutorials out there, you won't see much talk of > forks and pull requests - that's more of a GitHub-specific thing, I > guess. The Git tutorials focus mostly on branching, which I didn't even > mention here. Because that's when you start getting into the details > different projects handle differently, and where I think the workflow > document for this project could stand to spell things out in more detail. > > Anyhow, I hope this helps. > > Marc > > > ------------------------------------------------------------------------------ > 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... |
From: Marc S. <ma...@ou...> - 2014-01-12 07:25:13
|
Again, did you read my previous message where I laid out the basics? It kind of sounds to me like you never actually cloned you repo to your computer, so now you're just trying to push random files from any old folder to your fork. It doesn't work that way. You have to clone your fork to your local computer. That local repo on your computer is where you do all your work. You have to be in your local cloned repo when you do anything at all.— Marc Sabatella On Sat, Jan 11, 2014 at 11:00 PM, Joshua Nichols <jos...@gm...> wrote: >> >> Basically, you don't add files or folders to GitHub directly, or indeed >> make any changes whatsoever directly on GitHub. Instead, you make you >> changes - including adding files - to your local repo, then push them to >> your fork. > Please forgive me for being asinine about all of this, but I'm still WAY > behind. I tried many of the commands inside Git, and I'm not even sure why > it isn't working. > Unfortunately, I don't even know how to add a new file to the fork I > have.... > I feel so cumbersome! Your help is greatly appreciated, even if I keep > replying with utter ignorance. > IC, > Josh > On Sat, Jan 11, 2014 at 9:31 PM, Marc Sabatella <ma...@ou...>wrote: >> On 1/11/2014 7:28 PM, Joshua Nichols wrote: >> >>> How in the WORLD do I create folders and add files to GitHub? I have no >>> idea what to do... >>> >> >> Did you read my "big picture" summary? >> >> Basically, you don't add files or folders to GitHub directly, or indeed >> make any changes whatsoever directly on GitHub. Instead, you make you >> changes - including adding files - to your local repo, then push them to >> your fork. >> >> Marc >> >> -------------- next part -------------- An HTML attachment was scrubbed... |
From: Joshua N. <jos...@gm...> - 2014-01-12 06:00:21
|
> > Basically, you don't add files or folders to GitHub directly, or indeed > make any changes whatsoever directly on GitHub. Instead, you make you > changes - including adding files - to your local repo, then push them to > your fork. Please forgive me for being asinine about all of this, but I'm still WAY behind. I tried many of the commands inside Git, and I'm not even sure why it isn't working. Unfortunately, I don't even know how to add a new file to the fork I have.... I feel so cumbersome! Your help is greatly appreciated, even if I keep replying with utter ignorance. IC, Josh On Sat, Jan 11, 2014 at 9:31 PM, Marc Sabatella <ma...@ou...>wrote: > On 1/11/2014 7:28 PM, Joshua Nichols wrote: > >> How in the WORLD do I create folders and add files to GitHub? I have no >> idea what to do... >> > > Did you read my "big picture" summary? > > Basically, you don't add files or folders to GitHub directly, or indeed > make any changes whatsoever directly on GitHub. Instead, you make you > changes - including adding files - to your local repo, then push them to > your fork. > > Marc > > -------------- next part -------------- An HTML attachment was scrubbed... |
From: Joshua N. <jos...@gm...> - 2014-01-12 05:48:46
|
fatal: 'E:\EngravingChallenge\SchuV1.musx' is outside repository I cannot "git add SchuV1.musx" at all. I get the above error message. I am at a loss. IC, Josh On Sat, Jan 11, 2014 at 10:25 PM, Shane Brandes <sh...@gr...> wrote: > Well that can be a trouble too. Since it is possible to add files > directly with the browser interface and delete them too. Which means > if you have not done the same with your personal files living remotely > on your machine or where ever you keep them then it won't match things > and the whole ability to push goes poof. > So that being said the trouble is trying to find out why Josh is having > trouble. > It seems to me that he needs to try this maybe: > git add SchuV1.musx > git commit -am 'Commit message' > git push github > > That was a stumble for me also the fact you have to tell the git you > have added a file that you want to commit and then push into the git. > > > Shane > > On Sat, Jan 11, 2014 at 10:31 PM, Marc Sabatella <ma...@ou...> > wrote: > > On 1/11/2014 7:28 PM, Joshua Nichols wrote: > >> How in the WORLD do I create folders and add files to GitHub? I have > >> no idea what to do... > > > > Did you read my "big picture" summary? > > > > Basically, you don't add files or folders to GitHub directly, or indeed > > make any changes whatsoever directly on GitHub. Instead, you make you > > changes - including adding files - to your local repo, then push them to > > your fork. > > > > Marc > > > > > > > ------------------------------------------------------------------------------ > > 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... |
From: Shane B. <sh...@gr...> - 2014-01-12 04:26:03
|
Well that can be a trouble too. Since it is possible to add files directly with the browser interface and delete them too. Which means if you have not done the same with your personal files living remotely on your machine or where ever you keep them then it won't match things and the whole ability to push goes poof. So that being said the trouble is trying to find out why Josh is having trouble. It seems to me that he needs to try this maybe: git add SchuV1.musx git commit -am 'Commit message' git push github That was a stumble for me also the fact you have to tell the git you have added a file that you want to commit and then push into the git. Shane On Sat, Jan 11, 2014 at 10:31 PM, Marc Sabatella <ma...@ou...> wrote: > On 1/11/2014 7:28 PM, Joshua Nichols wrote: >> How in the WORLD do I create folders and add files to GitHub? I have >> no idea what to do... > > Did you read my "big picture" summary? > > Basically, you don't add files or folders to GitHub directly, or indeed > make any changes whatsoever directly on GitHub. Instead, you make you > changes - including adding files - to your local repo, then push them to > your fork. > > Marc > > > ------------------------------------------------------------------------------ > 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 |
From: Marc S. <ma...@ou...> - 2014-01-12 03:30:59
|
On 1/11/2014 7:28 PM, Joshua Nichols wrote: > How in the WORLD do I create folders and add files to GitHub? I have > no idea what to do... Did you read my "big picture" summary? Basically, you don't add files or folders to GitHub directly, or indeed make any changes whatsoever directly on GitHub. Instead, you make you changes - including adding files - to your local repo, then push them to your fork. Marc |
From: Joshua N. <jos...@gm...> - 2014-01-12 02:51:37
|
I tried adding files, but I got these messages in both times I tried: fatal: pathspec '*E:/EngravingChallenge/SchuV1.musx' did not match any files or fatal: 'E:/EngravingChallenge/SchuV1.pdf' is outside repository help? IC, Josh On Sat, Jan 11, 2014 at 8:36 PM, Urs Liska <ul...@op...> wrote: > > > Joshua Nichols <jos...@gm...> schrieb: > >How in the WORLD do I create folders and add files to GitHub? I have no > >idea what to do... > > Assuming you are in your repo file, do > > git checkout master > %just to be sure > > % add/edit file(s) > git add FILE > git commit > % this fires an editor for the commit message > git push > %uploads all necessary commits > > HTH > Urs > > > > > >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 > >> > > > -- > Urs Liska > openlilylib.org > -------------- next part -------------- An HTML attachment was scrubbed... |
From: Urs L. <ul...@op...> - 2014-01-12 02:37:13
|
Joshua Nichols <jos...@gm...> schrieb: >How in the WORLD do I create folders and add files to GitHub? I have no >idea what to do... Assuming you are in your repo file, do git checkout master %just to be sure % add/edit file(s) git add FILE git commit % this fires an editor for the commit message git push %uploads all necessary commits HTH Urs > >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 >> -- Urs Liska openlilylib.org |
From: Joshua N. <jos...@gm...> - 2014-01-12 02:29:13
|
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... |
From: Urs L. <ul...@op...> - 2014-01-12 02:03:36
|
Hi guys, unfortunately I've only been able to follow this via my mobile phone today. So I could only comment here and there, and much had to go by uncommented. And now it's _really_ time to go to bed. Tomorrow I've got a job, so I don't know how much time I actually will have. But I have fetched everything from all your forks (added all your forks as remotes to my local clone). So I hope to have some time investigating while in train. I think all this is very much and very fast for most of us. What I obviously estimated wrongly is that the share (and number) of people who are completely or relatively new to version control is so high. And now everybody wants to get their head above the water - at the same time. Therefore this mailing list sometimes reminds of a henhouse ;-) Thank you to those who have started to explain things to others, that's very valuable. We will make things simpler soon. Particularly I think it wasn't a good idea to design such a complex branching strategy. While this would be very practical in a real-world working repository it makes things even more difficult to understand. Basically we will cut down everything to one master branch. I will come back to this soon. And hopefully also continue with engraving myself. Best Urs |
From: Marc S. <ma...@ou...> - 2014-01-11 21:49:02
|
I've gone ahead and make a first round of layout optimizations and manual adjustments - basically corresponding to how far I'd take this for my own purposes. Meaning, I didn't fuss a whole lot with manually adjusting the shape or slurs etc, I just got things into the ballpark. And for lack of any better ideas, I emulated the original layout in terms of number of measures per system, spacing, etc. Here's my folder in my fork: https://github.com/MarcSabatella/engraving-challenges/tree/musescore/challenge02-schumann/MuseScore-2-0-devel I included reasonably detailed notes on my work in the README. I thought I was being clever in including an SVG version, since in principle Git can track these better than PDF or PNG. But if there is a straightforward way to force GitHub to deliver this to a browser in a way that allows the browser to actually render it, I haven't found it (apparently there is some whole other site called github.io that provides this functionality). So I posted my SVG somewhere else to make it easier to include a link so people can view the results make suggestions without having to figure out how to access the file from GitHub. Here it is: http://musescore.org/sites/musescore.org/files/schumann.svg Marc |
From: Urs L. <ul...@op...> - 2014-01-11 19:41:49
|
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. |