Clarified the git/branch workflow (at least I hope so)

This commit is contained in:
Sebastian Hugentobler 2014-05-09 10:45:14 +02:00
parent 333fa7b580
commit 76161fd7c8

View File

@ -23,6 +23,15 @@ Development
Main development happens at http://trac.vanwa.ch/sing_alongs but there is a
mirror of the git repository on [Github](https://github.com/thallian/sing_alongs).
The master branch contains only full songs (lyrics, melody and chords) and the
only time it is updated is for changing layout related stuff or merging a song.
Songs live in their own branch. If there is an error the branch gets fixed and
then merged into the master. I am not sure how well this goes with a growing
number of songs but lets see ;)
Also, the older songs may not have their own branch yet, so it has to be
created when the first correction comes up.
Contact
-------
You can reach me at [trac.singalongs@nulda.ch](mailto:trac.singalongs@nulda.ch)