Werner LEMBERG <w...@gnu.org> writes: >>> then I think it would be absolute cruelty to ask a new contributor >>> to attempt the same. >> >> Well, yes. The staging problem in connection with merges remains, >> but I would offer to do the process of making a suitable merge >> commit with convert-ly. [...] > > A general question: Usually, my fixes in the last time are > cosmetic-only ones (or minor documentation fixes). Is it OK to > continue with directly committing them to git master?
It would be better to go through dev/staging instead. If you push to master, master can no longer be fast-forwarded to dev/staging once Patchy or anybody else decides that dev/staging is in good state. Every time you do a push to master, it means somebody else has to rebase the whole of dev/staging on your push. Usually it is easier for you to rebase your small change on dev/staging instead, then push to staging (which will be a fast-forward as well after your push). -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel