Interesting approach. How do you do the merging? Is it manual? Just changed files? A hybrid?