Hi all, thanks for all your tips. I had a look at 'StGit', it seems to help me, so I will give it a try. For the workflow with branches, I will start a new build, when I'm back from 'Hackfest München'. Kind regards Regina