How to merge folders and files that are not directly branched from each other?

by XDK 9. December 2013 12:00

Solution:

Solution is to perform a baseless merge using Tf.exe. Following are the steps

1. Perform a Baseless Merge Using Tf.exe

  • Open command prompt
  • cd "<Work space folder>"
  • execute tf merge /recursive /baseless "Parent Folders\Files" "Child Folders\Files"  

          Example:    tf merge /recursive /baseless "$\Project A\Development" "$\Project A\Release\V1.0"

2. Resolve Merge Conflicts

3. Check-In the Merged Changes

You should see the relationship established  between folders\files 

Tags:

TFS 2012 | TFS 2013 | Visual Studio 2010 | Visual Studio 2012

How to disable the work item moving to resolved state while associating to a checkin

by XDK 21. August 2013 20:11

Work Around

Change the following key value to “False”.

HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\10.0\TeamFoundation\SourceControl\Behavior\@ResolveAsDefaultCheckinAction

Tags: , ,

Azure DevOps on-premises | TFS 2010 | TFS 2012 | Visual Studio 2010 | Visual Studio 2012

Generic trust failure error while installing KB2662296 package to Visual Studio SP1

by XDK 19. August 2013 12:43

Exception:

Explanation:

The error was due to incorrect or missing CDP URLs

Solution:

1. Open WIndows Command Prompt

2. Execute the following command

The above commands fetch the current CRL from the target URL and install it in this cert store to make it available for cert chain verification

Tags:

Azure DevOps on-premises | TFS 2012 | Visual Studio 2010

First step to recover from VS – TFS performance issues

by XDK 6. February 2013 07:07

Explanation:

Perform the following cache clean steps when you see VS – TFS performance issues

Solution:

TFS client cache clean up steps:

  • Close all Visual Studio IDE instances
  • Close browser or excel instances connected to TFS  
  • For Windows XP, delete all content under:

                C:\Documents and Settings\[USER]\Local Settings\Application Data\Microsoft\Team Foundation\

  • For Windows 7 or newer, delete all content under:

                C:\Users\[User]\AppData\Local\Microsoft\Team Foundation\

Tags:

Azure DevOps on-premises | Visual Studio 2010 | Visual Studio 2012 | Visual Studio 2013

MTM.exe stopped working

by XDK 20. August 2012 18:58

Workaround:

Delete TeamTest folder under C:\Users\%username%\AppData\Local\Microsoft

Tags:

Azure DevOps on-premises | TFS 2010 | Visual Studio 2010

About the author

My name is Xavier Dilip Kumar Jayaraj having 13+ years of IT experience which includes solid experience and depth Knowledge in Application Life Cycle Management, Configuration Management, Implementation and Support using TFS on-premises and Azure DevOps. I have invested in gaining DevOps knowledege to expertise with Cloud Computing providers namely Microsoft Azure and Amazon Web Services in recent years. I am very positive to learn and adapt emerging technologies to client’s environment.

Microsoft Certified: Azure Administrator Associate

Microsoft Certified: Azure DevOps Engineer Expert

DevOps Engineer Certificate Program | Transcript 

OTP-AWSD5: AWS IoT: Developing and Deploying an Internet of Things

[PCEP-30-01] PCEP – Certified Entry-Level Python Programmer

Quotes I Like

"Failure will never overtake me if my determination to succeed is strong enough."  - Dr. APJ. Abdul Kalam

"Always be yourself, express yourself, have faith in yourself, do not go out and look for a successful personality and duplicate it." - Bruce Lee

"Technology is just a tool. In terms of getting the kids working together and motivating them, the teacher is the most important." - Bill Gates

"Innovation distinguishes between a leader and a follower." - Steve Jobs

CategoryList

Disclaimer

The information provided here is based on my expreriences, troubleshooting and online/offline findings. It can be used as is on your own risk without any warranties and I impose no rights.