![]() ![]() I then global renames of two methods in the two branches and merged the results. ![]() I took a big folder full of TFS source code and branched it. It’s simple and contrived but it demonstrates the difference. To demonstrate the difference between TFS 2010 and TFS 11, I have run a sample scenario. People want it to just “handle” all the obvious merge cases and only draw their attention to places where they have real work to do. We spent a bunch of time trying to get to the bottom of this feedback and concluded that the primary issue is that when you do a merge, you get way too many reported conflicts that actually don’t require you to make meaningful decisions. Minimal conflicts when merging – Probably the biggest complaint that we hear about merging is that it’s way too cumbersome. Overall, it’s a much better default diff and merge experience than we’ve had before! I’ve included all three of the views you can choose from: Yes the text with the file names above the source looks dumb – that’s a bug.Īnd here are some screenshots of the merge experience. Side by side diff view in the provisional tab (all the way to the right) with a change highlighting gutter on the left, in line change highlighting, VS style class/method navigation, syntax coloring and more. You can observe many of the points I made above: Here are some screen shots to demonstrate. ![]() An interactive way of turning on/off ignoring whitespace.An improved way of manually selecting merge resolutions.Diff uses the new provisional tab feature in VS to avoid cluttering your document well.You can now take more actions from the views (like history, etc).When both diffing and merging, you can edit with the full power of the VS editor, including undo, Intellisense and everything!.Individual changes within a line are highlighted.It has syntax highlighting (as supported in the VS editor).It supports both “inline” and “side by side” modes and you can choose the one you like best.And before you say “but wait, I really love kdiff!”, don’t worry – it’s still configurable and you can use any tool you like but the out of the box one is now WAY better. Well not any more, it’s gone! We’ve built a new diff/merge experience based on the VS editor. It had been enhanced over the years to support globalization, Unicode, etc but it was, in essence, the same diff tool. We’ve made several significant improvements in the coming release:Ī new diff/merge experience – The one we’ve been shipping for the past 5 years is the original SourceSafe diff/merge tools – built while we were One Tree Software circa 1994. One of the things we consistently get customer feedback on in TFS 2010 is that merging is still too complicated and/or too limited. My last post was on workspace improvements. Here’s the next post in my series of “Developers are raving fans” enhancements coming in TFS 11. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |