testing our branching/merging approach using vs.net as the client