Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Federico Bruni
I would not hard-code the numbers in the names. If you have a file for the whole suite, which includes all the movements in the right order, you have already defined the order. Cleaner and more flexible, in my opinion. On 14 maggio 2014 04:46:22 CEST, Knute Snortum ksnor...@gmail.com wrote: I

Re: [Mutopia-discuss] clean pull requests?

2014-05-14 Thread Knute Snortum
Regarding merge commits: I will (and have) stopped merging the topic branches into main. But there are merges I'm supposed to make: Synchronize with your local repository Make sure you are in your master branch (not one of your topic branches), and fetch any upstream changes: $ git checkout

Re: [Mutopia-discuss] clean pull requests?

2014-05-14 Thread Knute Snortum
Regarding pull requests: I would like to be able to see what is going to be on a pull request before I create it -- or be able to delete a pull request if it has commit on it I don't want. From what I can see in GitHub, once you create a pull request, it's too late to modify it. Is there some

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Knute Snortum
This is how I propose to have the movements and the suite: https://drive.google.com/folderview?id=0B_aEseOV9KTXamtCeUhXenF2eWcusp=sharing Knute Snortum (via Gmail) On Wed, May 14, 2014 at 4:44 AM, Knute Snortum ksnor...@gmail.com wrote: I agree. My original idea was to do this: put the

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Federico Bruni
Il 14.05.2014 14:43 Knute Snortum ha scritto: This is how I propose to have the movements and the suite: https://drive.google.com/folderview?id=0B_aEseOV9KTXamtCeUhXenF2eWcusp=sharing [21] A couple of comments: - your -all.ly file, which includes all the movements, doesn't print the

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Knute Snortum
I love it. A while ago I asked how to create a single all-movements suite file and this is exactly what I needed to see. Now I need to know how to submit this. One branch and pull request for each movement separately and one for the suite? Knute Snortum (via Gmail) On Wed, May 14, 2014 at

[Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
Do we have any git experts here? I merged a topic branch to master, which I now know not to do. But this merge shows up on all of my pull requests. How do I back out the merge and make the pull requests clean? git revert doesn't seem like the right thing, because it creates commits rather than

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Knute Snortum
I would put all the changes into one pull request (I wouldn't even use a branch) but Glen has said (and this document [1] implies) that there should be one file per branch per pull request. I admit that this seems strange but I'm trying to do things the Mutopia way. [1]

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Federico Bruni
Il 14.05.2014 17:02 Knute Snortum ha scritto: I would put all the changes into one pull request (I wouldn't even use a branch) but Glen has said (and this document [1] implies) that there should be one file per branch per pull request.  I admit that this seems strange but I'm trying to do

Re: [Mutopia-discuss] Renaming file names of movements

2014-05-14 Thread Javier Ruiz-Alma
Hi Knute, The issue of collections, availability of a consolidated PDF including all pieces as well as individual pieces, maintainability, and support within the current structure and automation is a great topic to discuss. I've created a discussion topic in github to collect proposals and

Re: [Mutopia-discuss] Contribute document clarification

2014-05-14 Thread Glen Larsen
On Wed, May 14, 2014 at 8:17 AM, Knute Snortum ksnor...@gmail.com wrote: In https://github.com/chrissawer/The-Mutopia-Project/wiki/Setting-up-for-Contributions-via-GITHUB Under Synchronize with your local repository, Couldn't $ git fetch upstream$ git merge upstream/master be

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Felix Janda
git reset --hard should be able to fix up your master. Then make new topic branches and git-cherry-pick your work into them. Then make new pull-requests and close the old ones. (Can you really not do this yourself? If not you could still add a comment to the pull-request.) Felix

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
Thanks Felix, I'll try that. If I can close a pull request, I don't see how to on GitHub. I may just be missing it, though. If anyone knows how to do it, please tell me. Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:00 AM, Felix Janda felix.ja...@posteo.de wrote: git reset --hard

Re: [Mutopia-discuss] clean pull requests?

2014-05-14 Thread Glen Larsen
Of course this will work --- master is a branch like any other branch and you could specify master in your pull request. It is not recommended practice because: - You now have to wait until that pull request is processed to submit other work - If you now create a branch that change is

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Glen Larsen
On Wed, May 14, 2014 at 11:23 AM, Knute Snortum ksnor...@gmail.com wrote: Thanks Felix, I'll try that. If I can close a pull request, I don't see how to on GitHub. I may just be missing it, though. If anyone knows how to do it, please tell me. Closing is a product of merging the pull

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
I have pulled out all the ly files I have been working on and stowed them. I'll put them back one by one when my repository is clean. Then hopefully I will be able to create clean pull requests. BTW, I found out how to delete a pull request: close it first. I had assumed Close meant the