Monday, October 17, 2011

merging in TFS demystified

When merging changes with Team Foundation Server's default merge tool one will see three windows, two small windows (for the code one currently has and the code one is trying to merge in) and one large window (for the ultimate concoction of the two). The two small windows will sit side by side and conflicts will be denoted by a thick black line running across the two windows. One may click on areas near the black lines to add the content from one of the two small windows to the concoction. Areas still highlighted in light blue have not yet been resolved.

No comments:

Post a Comment