@daggertooth@monsterpit.net what i started doing for computer fairies was create a "computerfairies" branch, commit every change i make, when i update from master i do. for example:

git fetch
git merge v1.6.1

from the computerfairies branch