Integration Guide

vsts logo Team Foundation Services (TFS) Integration Jira Cloud

Connecting to Team Foundation Server Jira Cloud

This process requires an existing Contributor user access to TFS projects.

  1. On your Jira Cloud dashboard menu, go to Git > Manage Git Repositories.
  2. The git configuration page for connecting repositories is displayed.
  3. On the Auto-connect integration panel, click Microsoft.
  4. git for jira cloud auto-connect panel - select tfs
  5. On the following screen, select Team Foundation Server.
  6. git for jira cloud tfs connect and login screen Enter the Host URL, Username and Password for this connection.  The › Advanced twisty has the default /tfs path.  Thus, there is no need to add the /tfs to the Host URL path. Click Next to continue.
  7. Repositories of the connected Team Foundation Server can be automatically connected to Jira Cloud.  Repositories that are added or removed from TFS will be likewise connected or disconnected from Jira Cloud.
  8. Click Connect.

The TFS repositories are now connected to Jira Cloud.

Working with Branches and Pull Requests with Git add-on and Team Foundation Server Jira Cloud

The Git Integration for Jira add-on supports creation of branches from Jira via the developer panel.

  1. Open a Jira issue then click Create Branch under Git Commits > Branches group on the developer panel.
  2. The following dialog is displayed:
  3. jira cloud tfs create branch dialog
  4. Click Create Branch.
  5. The branch is created and can be viewed under the Branches tab in your TFS server.
  6. TFS server web ui branches list
  7. To update the branch list to your Visual Studio's Team Explorer, perform a Pull action on the connected team project.  The branches list in your VS IDE should be updated now.
  8. On the Team Explorer, click Branches.
  9. Click New Branch then select the newly-created branch from the dropdown list.
  10. Click Create Branch.
  11. The selected branch is now listed under the Published Branches in the Team Explorer.
  12. Make changes to a file or project then perform a commit to the selected branch: VS IDE team explorer branch commit
    • On the Team Explorer, click Changes.
    • Make sure that Branch: displays the name of the newly-created branch.  If not, select it again from the list.
    • Click Commit and Push.

TFS Pull Request

The pull request feature works the same as merge request.

To create a pull request and merge it to the main source (master):

  1. Open the Jira issue where you previously created a branch.
  2. On the developer panel under Git Commits > Pull Requests, click Create pull request.
  3. The following dialog is displayed: jira cloud tfs create pull request dialog
    • Select your working Repository.
    • Set the Source branch to the newly-created branch.
    • Set the Target branch to master.
    • Give the pull request Title a descriptive name or leave it as is.
  4. Click Create.
jira cloud tfs branch and pull request status on dev panel

The branch and the pull request status are displayed on the developer panel.

The pull request is also listed in the TFS server:

TFS pull request list merge pending status

 

Merging Branch to master

Continuing from the above steps, the current branch is ready for merge.

TFS server web ui pull request merge status
  1. On your Team Explorer, go to Branches.
  2. Click Merge. VS IDE team explorer merging branch to master
    • Set the source to the branch you pushed the commits to.
    • Set the target branch to master.
  3. Click Merge to continue.

The reviewer's approval is required to completely merge the pull request. This usually takes place in the TFS server web UI where your updated code is being reviewed.

tfs web ui pull request approved for merge

Once approved, the team leader or reviewer can then complete the merge.  The commit can be viewed in the associated Jira issue page.

tfs branch and pull request merge commit