TechPrufer
Get started
Microsoft
Microsoft logoMicrosoft · Feature trail

Git-TF Integration with Team Foundation Service

8 posts · May 2012 – Jul 2018

What this trail covers

This thread tracks the integration of Git-TF with Team Foundation Service, focusing on authentication and compatibility updates to ensure seamless version control operations between Git and TFS. This post adds the ability to associate Team Services or Team Foundation Server work items with commits directly from IntelliJ and Android Studio. The workflow involves selecting work items from a dialog within the commit dialog, which then updates the commit message with the work item details using the #id tag for server-side association upon push. This integration aims to simplify the process of linking code changes to work items without disrupting the developer's workflow.

All Microsoft trails
  1. Top Stories from the Microsoft DevOps Community – 2018.07.06This post introduces guidance on adopting SQL Change Automation in VSTS pipelines, a fix for Azure WebApp deployment issues related to old assemblies not being cleaned, a Power BI template (FlowViz) for agile team flow metrics with predictive analytics, integration of VSTS Package Management feeds with Octopus Deploy, and a best practice for deploying Entity Framework Core 2.1 migrations from a DLL using a VSTS build and release extension.
  2. Official Release of TFVC Support for Visual Studio CodeIntroduces official support for Team Foundation Version Control (TFVC) in Visual Studio Code through the Visual Studio Team Services extension. This enables core TFVC operations (add, delete, rename, move, view changes/history, include/exclude, merge conflicts, check-in, update, associate work items) directly within VS Code, eliminating the need to switch to command-line tools. It also provides repository build status and work item browsing capabilities. Supports TFVC on Team Foundation Server 2015 Update 2+ and Team Services across Windows, macOS, and Linux.
  3. Official Release of TFVC Support for the Visual Studio Team Services Plugin for Android Studio and IntelliJThis post announces the official release of TFVC support in the Visual Studio Team Services plugin for Android Studio and IntelliJ IDEA. The plugin now officially supports core TFVC version control actions directly within the IDE, including checkout, add, delete, rename, move, checkin, update, merge conflicts, lock/unlock, and add labels. It also provides enhanced features like viewing repository-related build statuses and browsing assigned work items.
  4. TFVC Support in Preview for Team Services Plugin for IntelliJ and Android StudioIntroduces preview functionality for Team Foundation Version Control (TFVC) support in the Team Services plugin for IntelliJ and Android Studio. This includes checkout from Team Services or Team Foundation Server 2015, managing local changes (view, add, rollback), workspace operations (create, view, edit), checkin/update, and handling merge conflicts from updates.
  5. Team Services Plugin for IntelliJ and Android Studio 1.0 ReleaseThis post announces the 1.0 release of the Team Services plugin for IntelliJ and Android Studio. It highlights features such as checking out repositories from Team Services/TFS, creating branches from work items, associating work items with commits, checking build status, viewing work items via personal queries, creating and checking pull request status, and importing new projects. It also provides links to a tutorial video, documentation, download instructions, and the open-source GitHub repository.
  7. Work Item Integration for IntelliJ and Android StudioIntroduces the ability to associate Team Services or Team Foundation Server work items with commits directly from IntelliJ and Android Studio via the Team Services Plugin. The workflow allows users to select assigned work items from a dialog within the commit dialog, which then updates the commit message with the work item ID for server-side association upon push.
  8. Visual Studio Team Services announces the newest release of our Eclipse Plugin: Team Explorer Everywhere (TEE) 14.0.2This release of Team Explorer Everywhere (TEE) 14.0.2 for Eclipse adds support for Eclipse Mars, and crucially, allows Team Foundation Projects to contain a mix of both Git and TFVC repositories, a significant change from previous limitations where projects could only have one or the other. It also includes improvements to server connection caching, TFVC Git operations reliability, local workspace scanning performance, startup performance, security of federated authentication cookies, TFVC check-in blocking of work item querying, handling of server URLs with encoded characters, TFVC Source Control Explorer's ability to open files with unassociated extensions, and fixes for plugin shutdown defects and authentication deadlocks.
  9. New build of git-tf required for use with Team Foundation ServiceThis post announces a new build of git-tf that is required to work with an update to Team Foundation Service. It states that using an older version of git-tf will result in repeated password prompts and authentication failures.
  10. Locking and git-tf and... danger?This post explains the locking mechanism in `git-tf checkin` and the dangers of using the `--no-lock` flag. It details the steps involved in `git-tf checkin` and illustrates a race condition scenario where a concurrent check-in from a different TFS client can lead to missed changesets and an inconsistent high-water mark. The post also suggests potential workarounds for this issue and invites discussion on the Codeplex site.
  11. Team Foundation Server and Xcode projects with git-tfThis post details the practical usage of `git-tf` for cloning a TFS repository into a local Git repository, making changes in Xcode, and then checking those changes back into TFS. It provides command-line examples for cloning with `--deep` to preserve history and for checking in changes. The post also illustrates how these operations integrate with Xcode's source control features and trigger CI builds in TFS.
  12. TFS Integration Tools – What is the difference between cloaking and scoping branches?This post introduces the concepts of 'Merge Scope' and 'Cloaking' within the TFS Integration Tools to manage the scope of version control migrations. Merge Scope allows for preserving branch/merge relationships within a defined path, while Cloaking allows for excluding specific branches from the migration. The post explains the impact of each on migration conflicts and provides a summary table of their use cases.