UI Bug: resolving multiple merge conflicts

Resolving merge conflicts is hard enough already.  Which branch is “target,” again?  Unfortunately there’s a bug in v1 that makes it even harder.  If you select multiple conflicts in the main Resolve dialog… …then you get this abomination: Yikes!  Allow me to translate. Command line / client API “Resolve version conflict” dialog “Resolve selected conflicts”…

1

TFS Branch & Merge whitepaper plus recommended links

It’s finally here!  Our first real guidance on branching & merging has been posted, on a Codeplex wiki no less.  I reviewed several drafts of the paper, but the real credit goes to Mario for driving our (the product group’s) side of the process.  Congrats to him, the UE team, and the VSTS Rangers on…

2

When your feature hits the blogosphere: SCM and the Windows Shutdown crapfest

Moishe Lettvin has a great blog entry, an inside look at how a Vista feature ate thousands of man-hours on its way to the lowest common denominator.  I don’t mind the UI myself (and certainly won’t justify Joel’s histrionics with a link) but it does illustrate several common pitfalls in large-scale software development. Windows has a tree…