This is where the Visual Studio Shelving function can help. A shelf is a place on the server in source control that is separate from the main code line so it will not affect other developers.