VSTS | TFS 2015 & TFS 2017
This guide covers the basics so you can get up and running using Git with code already in Visual Studio Team Services (VSTS) or Team Foundation Server (TFS). Explore our full tutorial for more information on how to use Git from Visual Studio or the command line.
Get your code
To get a copy of the source code, you will clone a VSTS Git repository. Cloning creates both a copy of the source code for you to work with and all the version control information so Git can manage the source code.
If you don't have a Git repository yet, you can create one using your own code and continue with the steps to commit and share your work.
In Team Explorer, open up the Connect page by choosing Projects and My Teams then Manage Connections
Select Manage Connections, then select Connect to Project.
The Connect to a Project dialog appears. Select the repo you want to clone from the list and select Clone. If you don't see your repo listed, you can filter the list to find it or add a Team Foundation Server where the repo is hosted by selecting the Add Server link.
Verify the location of the cloned repo on your PC and select Clone.
Commit your work
Git branches isolate your changes from other work being done in the project. The recommended Git workflow uses a new branch for every feature or fix you work on. You make commits in your local Git repository to save your changes on that branch.
In Team Explorer, click the drop down and choose Branches. Right click the master branch and choose New Local Branch From...
Choose a descriptive branch name for your work to remind you and others what kind of work is in the branch.
Make changes to your files in the cloned repo. From the Team Explorer Home view, you can open up Visual Studio solutions in the repo or browse the repo contents using the Show Folder View link. Git keeps track of changes made to your code both inside and outside of Visual Studio.
When you are satisfied with the changes, save them in Git using a commit. Open up the Changes view from Team Explorer. Stage the changes to add to your next commit by right-clicking the files and selecting Stage, add a message describing the commit, then select Commit Staged.
Share your changes
When you are ready to share your changes with the team, you push those changes so that others can reach them. You can only push changes after you add commits to a branch.
Once you push the changes, you can create a pull request to let others know you'd like to have the changes reviewed and added to the master branch of the code.
Open up the Synchronization view in Team Explorer. You can see the outgoing commits and share them by clicking Push if you are working with a branch that is already shared, or Publish if you are working with a newly created local branch.
Create a pull request so that others can review your changes. Open Pull Requests in Team Explorer, and click New Pull Request. Verify the remote branch to merge the changes into, such as
You can review comments made in your pull request in a web browser on the VSTS project page. Once all changes are approved by the team, you complete the pull request through the web browser.
Sync with others
To get changes from others and keep your code up to date, you pull commits made by others and merge them into your branch. Git is very good about merging multiple changes even in the same file, but sometimes you might have to resolve a merge conflict. It's a good idea to pull your branches regularly to keep them up to date with the changes from others. This makes sure that your feature branches from your main branch are using the latest version of the code.