Automatic merging for TFS, kinda like rebasing, but not nearly as cool :(