Making a change to a style file Select Ctrl+Shift+S to save all documents. In Team Explorer – Pending Changes, select the Check In button. If you are prompted to confirm the check-in, please do so. Figure Checking in changes to the style file Switch users and log in as Julia once again. In Solution Explorer, right-click on Site.css and select Get Latest Version from the context menu. Figure Get latest version of style file In the Site.css file, note that the body font-size property has been updated with Cameron’s change, but that we also still have our current change where we updated the color property to red. This demonstrates that, wherever possible, Team Foundation Server 2012 and Visual Studio 2012 attempt to auto-merge changes, rather than needing the user to be involved with the merge process. This can save you several steps when compared to previous versions. Figure Style file showing auto-merged update Switch users and log in as Cameron. Let’s create a change that will force a manual merge process. In Site.css, change the body color property to black. Figure Changing style with a change that will conflict with another user Select Ctrl+Shift+S to save all documents. Check in the pending change.
Making a change to a style file Select Ctrl+Shift+S to save all documents. In Team Explorer – Pending Changes, select the Check In button. If you are prompted to confirm the check-in, please do so. Figure Checking in changes to the style file Switch users and log in as Julia once again. In Solution Explorer, right-click on Site.css and select Get Latest Version from the context menu. Figure Get latest version of style file In the Site.css file, note that the body font-size property has been updated with Cameron’s change, but that we also still have our current change where we updated the color property to red. This demonstrates that, wherever possible, Team Foundation Server 2012 and Visual Studio 2012 attempt to auto-merge changes, rather than needing the user to be involved with the merge process. This can save you several steps when compared to previous versions. Figure Style file showing auto-merged update Switch users and log in as Cameron. Let’s create a change that will force a manual merge process. In Site.css, change the body color property to black. Figure Changing style with a change that will conflict with another user Select Ctrl+Shift+S to save all documents. Check in the pending change.