From 76161fd7c80c54522f36a42ebed73048a6cb547a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 9 May 2014 10:45:14 +0200 Subject: [PATCH] Clarified the git/branch workflow (at least I hope so) --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 57234e3..7ba3524 100644 --- a/README.md +++ b/README.md @@ -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)