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 any of the things (at least I) use git for. One file on one branch with no commit history. Why not just send the files in via email? I may be an edge case, but let me show you why the git model as I understand it adds complexity without any advantage (in fact, there is a major disadvantage.) So, to add a movement to a suite, I - checkout master - fetch upstream - merge with master - create a branch - checkout the branch - create the ly file - add the ly file - commit the ly file - push the branch to my forked github account - get on github - select the new branch - create a pull request - delete the branch on github - delete the branch on my local repository Instead of - create the ly file - send in the ly file via email Does submitting the file via github make it easier for you? Because it makes it harder for me. I'm not working at the moment to I have a lot of time and I like to spend a good chunk of it transcribing music. This means I can sometimes do a movement in a day or two. I currently have about seven files (and seven branches) that are not on the master. I am still learning how to best create ly files. I may have a trick or a section of code I want to reused from an older branch but because I can't merge back to master, I have to checkout the old branch, stow the file somewhere, checkout the new branch and pull in the file. If I want something from several branches, this can be a real mess. So why are we doing fourteen steps to get one file into git without version or commit history that no one is going to merge with anyway? Knute Snortum (via Gmail) On Tue, May 13, 2014 at 3:27 PM, Glen Larsen <[email protected]> wrote: > 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 commit messages so I may add some > pointers to resources explaining how to squash commits in GIT. > > [Thanks for the wiki edits, Federico!] > > > On Tue, May 13, 2014 at 3:14 PM, Federico Bruni <[email protected]>wrote: > >> Il giorno mar 13 mag 2014 alle 23:09, Javier Ruiz-Alma < >> [email protected]> ha scritto: >> >> Hi Federico, >> Glen graciously added instructions on how to setup your github fork, and >> basic >> workflow<https://github.com/chrissawer/The-Mutopia-Project/wiki/Setting-up-for-Contributions-via-GITHUB> >> involved >> in maintaining existing pieces in Mutopia using github. >> He also a started a document to highlight LilyPond coding >> practices<https://github.com/chrissawer/The-Mutopia-Project/wiki/Best-practices-for-new-submissions> >> for >> new submissions to Mutopia, which enhance the maintainability moving >> forward. >> >> Today, I drafted a new doc covering new submissions: >> >> https://github.com/chrissawer/The-Mutopia-Project/wiki/Guidelines-for-new-score-submissions-using-github >> >> Github has proven to be a great environment for code collaboration, and we >> welcome contributors using pull-requests. >> >> Javier Ruiz-Alma >> >> >> On Tuesday, May 13, 2014 8:29 AM, Federico Bruni <[email protected]> >> wrote: >> >> I've just given a quick glance to the pull requests sent today by >> ksnortum. >> I see a lot of merge commits which are unnecessary. I don't know how >> this is sorted out when merging.. >> >> I'm writing here to get some feedback on how to improve our wiki: >> >> https://github.com/chrissawer/The-Mutopia-Project/wiki/Setting-up-for-Contributions-via-GITHUB >> >> I usually try to avoid any merge commit in my pull requests. I think >> that it's all about rebasing instead of merging, right? >> It should be quite easy for us, I think, since we usually organize and >> book the files to be added/updated. >> >> Suggestions are welcomed. >> Thanks >> Federico >> >> _______________________________________________ >> Mutopia-discuss mailing list >> [email protected] >> http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss >> >> >> Thanks Javier, this new page was the missing bit! >> I've updated the main page of the wiki and added an "index" of the >> articles (even if there's an automatic list under Pages on the right). >> >> It seems that wiki links are better: - [[|]] >> https://help.github.com/articles/adding-links-to-wikis >> >> https://github.com/chrissawer/The-Mutopia-Project/wiki >> >> >> _______________________________________________ >> Mutopia-discuss mailing list >> [email protected] >> http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss >> > > > _______________________________________________ > Mutopia-discuss mailing list > [email protected] > http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss >
_______________________________________________ Mutopia-discuss mailing list [email protected] http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
