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] 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] clean pull requests?

2014-05-13 Thread Federico Bruni
Il giorno mar 13 mag 2014 alle 23:09, Javier Ruiz-Alma jav...@ruiz-alma.com ha scritto: Hi Federico, Glen graciously added instructions on how to setup your github fork, and basic workflow involved in maintaining existing pieces in Mutopia using github. He also a started a document to

Re: [Mutopia-discuss] clean pull requests?

2014-05-13 Thread Glen Larsen
In Mutopia there is typically no real need to merge other updates into a development branch because [1] it doesn't have dependencies to other parts of the Mutopia archive and [2] changes to a single piece within the archive are done by a single individual. I would prefer a minimal number of

Re: [Mutopia-discuss] clean pull requests?

2014-05-13 Thread Knute Snortum
Frederico, I am confused by what you mean by a merge commit. Since it is something I should try to avoid, I should understand what it is. Is it merging a branch into master and committing it? Glen, I know I'm new to Mutopia. Help me understand why you are using git. It seems you do not want