Skip to content

Latest commit

 

History

History
244 lines (144 loc) · 11.7 KB

gitquickstart.md

File metadata and controls

244 lines (144 loc) · 11.7 KB
title titleSuffix description ms.assetid ms.technology ms.topic ms.date monikerRange
Get started with Git and Visual Studio 2017
Azure Repos
Quickstart with Azure Repos and Visual Studio 2017
d7dcb364-056f-421b-8896-0304cddf12fe
devops-code-git
conceptual
11/15/2019
>= tfs-2017

Get started with Azure Repos and Visual Studio

Azure Repos | Azure DevOps Server 2020 | Azure DevOps Server 2019 | TFS 2018 - TFS 2015 | VS 2017

Azure DevOps Server was formerly named Visual Studio Team Foundation Server (TFS).

[!div class="op_single_selector"]

Get up and running using Git with code already in Azure Repos. For more information on how to use Git from Visual Studio or the command line, see Azure Repos Git tutorial.

If you don't have your code in an Azure Repos or Azure DevOps Server Git repo, visit our Visual Studio or command line getting started articles to learn how to create a local repo for your code and push it to Azure Repos.

[!INCLUDE temp]

Get your code

To get a copy of the source code, you clone a 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. Continue with the steps in this article to commit and share your work.

Visual Studio

[!INCLUDE temp]

  1. In Team Explorer, select Connect to open the Connect page, and then choose Manage Connections > Connect to Project.

    Cloning Azure DevOps Server Git repositories in Visual Studio

  2. In Connect to a Project, select the repo you want to clone and select Clone. If you don't see your repo, select Add Azure DevOps Server to add a server that hosts a repo. You can filter the list to find your repo.

    Cloning a Git Repository from a connected organization in Azure Repos

    [!INCLUDE project-urls]

  3. Verify the location of the cloned repo on your computer and select Clone.

Command Line

  1. Download and install Git and the Git Credential Manager for your platform.

  2. Open the Azure DevOps Services web portal in your browser by going to https://<your account name>.visualstudio.com.

  3. Open the Azure DevOps Services web portal in your browser by navigating to https://<your account name>.visualstudio.com and find your Git repository. Copy the clone URL from the Clone pop-up.

    Finding the Clone URL for your Git Repository in Azure Repos

    [!INCLUDE project-urls]

  4. At the command prompt, go to the folder where you want the code stored on your local computer.

  5. From the command prompt, run git clone followed by the clone URL, as shown in the following example.

    git clone https://dev.azure.com/fabrikam-fiber/_git/FabrikamFiber

    Git downloads and creates your own copy of the code in a new folder for you.

Commit your work

Git branches isolate your changes from other work 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.

Visual Studio

[!INCLUDE temp]

  1. In Team Explorer, select the Home button and choose Branches.

    Screenshot showing Branches in Team Explorer.

  2. Right-click the main branch and choose New Local Branch From.

    Creating a Local Branch off the Main branch in Visual Studio

  3. Enter a descriptive branch name for your work to remind you and others what kind of work is in the branch. Select Create Branch.

    Enter a descriptive branch name and select Create Branch.

  4. Make changes to your files in the cloned repo. From the Team Explorer Home view, you can open Visual Studio solutions in the repo or browse the repo contents using Show Folder View. Git keeps track of changes made to your code both inside and outside of Visual Studio.

  5. When you're satisfied with the changes, save them in Git using a commit. Open the Changes view from Team Explorer by selecting the Home button and choosing Changes.

    Screenshot that shows opening the Changes view.

  6. Enter a message that describes the commit, and select Commit All.

    Commit All

    [!NOTE] If you have multiple files and you don't want to commit them all, you can right-click each file and choose Stage. When you have staged all the files you would like to commit, select Commit Staged. Commit Staged replaces Commit All when you manually stage your changes before the commit.

    Stage files

Command Line

  1. Create a branch where you make your changes to the code. If you're collaborating with someone using a branch they've created, you can skip to the following git checkout step.

    git branch ReadMeFix

    Choose a descriptive branch name for your work to remind you and others what kind of work is in the branch.

  2. Check out your branch so you can start working in it.

    git checkout ReadMeFix

    You can also use the checkout command to start working on a branch that other team members are already working in.

  3. Make changes using your favorite tools on the code.

  4. When you're satisfied with the changes, even if you aren't ready to share the work, save them in Git using a commit. Your changes won't be shared until you push them, as described in the following section.

    git commit -a -m "Descriptive message"

    This command saves your changes locally to a new commit in Git. Make sure to give the commit a short message that describes your changes after -m.

Share your changes

When you're ready to share your changes with the team, 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. A pull request lets others know you'd like to have the changes reviewed. After approval, a pull request adds your changes to the main branch of the code.

Visual Studio

[!INCLUDE temp]

  1. In Team Explorer, select Home and then choose Sync to open Synchronization.

    Synchronization

    You can also go to the Synchronization view from Changes by choosing Sync immediately after making a commit.

    Choose Sync immediately after making a commit.

  2. Select Push to share your commit with the remote repository.

    Push

    If this push is your first to the repository, you'll see the following message: The current branch does not track a remote branch. Push your changes to a new branch on the origin remote and set the upstream branch. Select Push to push your changes to a new branch on the remote repository and set the upstream branch. The next time you push changes, you'll see the list of commits.

  3. Create a pull request so that others can review your changes. Open Pull Requests in Team Explorer by selecting Home and choosing Pull Requests.

    Pull Requests

  4. In Pull Requests, you can view pull requests opened by you, assigned to you, and you can create new pull requests. Select New Pull Request to open a web browser where you can create the new pull request in the Azure Repos web portal.

    Select New Pull Request.

  5. Verify your branches. In this example, we want to merge the commits from the ReadMeFix branch into the main branch. Enter a title and optional description, specify any reviewers, optionally associate any work items, and then select Create.

    Create a Pull Request in the web portal

    For more information on pull requests, see the pull request tutorial.

Command Line

  1. Push your branch so that others can see the changes you've saved.

    git push -u origin ReadMeFix

  2. Open the project in the web portal and browse to your repository under the Code tab. Select Create a pull request to create a pull request for the branch that you pushed.

    Creating a new Pull Request in Azure Repos

  3. Verify your branches. In this example, we want to merge the commits from the ReadMeFix branch into the main branch. Enter a title and optional description, specify any reviewers, optionally associate any work items, and select Create.

    Create a Pull Request in the web portal

  4. Once the changes are approved, complete the pull request. A complete pull request adds your changes from the branch into the main branch of the code.

    For more information on pull requests, see the pull request tutorial.

Sync with others

To keep your code up to date, 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. Pulling often makes sure that your feature branches from your main branch are using the latest version of the code.

Visual Studio

[!INCLUDE temp]

  1. In Team Explorer, select Home and choose Sync to open Synchronization.

    Synchronization with others.

  2. You can download the latest changes to your branch using the Pull link. There are two Pull links, one near the top and one in the Incoming Commits section. You can use either because they both do the same thing.

    Download changes to your local repo

Command Line

  1. Switch to the branch where you want to download the changes others have made.

    git checkout ReadMeFix

    In this example, you pull changes made by others on your team to the ReadMeFix branch to your local copy of the branch.

  2. Pull the changes made by others to your local branch.

    git pull

    Git downloads the changes and merges them with your own changes into your local branch.