Posts

Showing posts with the label TFS

Baseless merge!

Baseless merge in TFS ? or a Baseless Question? :-) A colleague came over wondering for what someone asked him to do - and that is to merge two branches. I believe, the tool allows you to do that however, I wouldn't recommend it simply because it is a sort of sibling-sibling merge rather than (what it is intended for) parent-child merge. Reference to support my perspective ... How do I merge two branches? To perform a merge, you can use the merge functionality in Source Control Explorer, or you can use the  merge  command-line tool. You can merge based on changeset, label, date, or version. You might find that your branching structure becomes deeper than one level. If this happens, keep in mind that it is only possible to merge one level at a time. For example, consider the following source tree structure: Development  – Container for isolation development branches. Feature A Source Feature B Source Main  – Main integration build bran...

TFS | The Power of Search

Image
This morning, a colleague of mine prompted me to find a list of changeset checked-in by a user .. I wasn't surprised to not find in either VS 2010 or VS 2012 but was little when I can't find under the TFS Power Tool plugin for Visual Studio (Team menu), however TFS Power Tool is not restricting! TFS Power Tool has this nice little nifty command tfpt searchcs Open up the Command Prompt for VS and there you go ... The tfpt searchcs brings up a popup window as below .. and you have various options to interrogate the change sets ... Happy Searching! Reference: TFS Power Tools for VS 2012 http://visualstudiogallery.msdn.microsoft.com/b1ef7eb2-e084-4cb8-9bc7-06c3bad9148f TFS Power Tools for VS 2010 http://visualstudiogallery.msdn.microsoft.com/d0d33361-18e2-46c0-8ff2-4adea1e34fef