Exciting new updates to the Git experience in Visual Studio

Avatar

Pratik

Update Nov. 17, 2020: Integrated Git experience released

We’ve seen a lot of enthusiasm in the past few months with the improvements we’ve been making to the Git integration for Visual Studio 2019. You can learn more about how to use the entire feature set in our new documentation. We’ve also received a healthy amount of good feedback that’s helped us focus our efforts. We first announced the new changes in a blog post in March. Since then, the team has been hard at work analyzing the feedback, polishing the user interface, and building more features. We’re excited to share those updates with you today.

If you haven’t tried the new Git user experience in Visual Studio yet, download the latest Preview and you’ll get the newest updates to the experience by default. If you’re using the public Release of Visual Studio (version 16.6+), then hit Ctrl+Q to search and type in ‘New Git user experience’ to turn it on from the Preview Features pane of Tools – Options.

Image Tools Options Preview Features

New Git user experience Preview Feature flag

You can turn the experience off using the same checkbox.

Merge Conflict Resolution improvements

As we talked to customers about the pain points they face when working with source control, we consistently heard about the frustration with merge conflicts. When you get a merge conflict, it interrupts your coding flow and forces you to switch context. We also realized we needed better messaging to indicate you encountered a conflict during a Git pull operation. To address these concerns, the Git Changes tool window now clearly lists unmerged changes and displays a status message specifying that conflict resolution is in progress.

Image image of Git Changes window with unmerged changes

Merge in progress with conflicts (unmerged changes)

In addition, in our user studies, as we walked through different workflows, we noticed that not all developers always have the Git Changes window open. If you don’t, you’ll only see the file with conflict indicators and may try to manually resolve the conflicts in-line. We all know how painful that can be, especially for large files with many conflicts. So, we added a gold info bar at the document level to notify you when the file contains conflicts, prompting you to open the Merge Editor.

Image image of merge editor gold info bar

Gold info bar with link to open merge editor

The three-way Merge Editor has undergone quite a revamp based on ongoing customer feedback. We’ve changed the legacy TFVC terminology of Source and Target to Incoming and Current with a strong emphasis on the branch name. This used to be a constant point of confusion. Incoming and Current also each have a new checkbox to take all changes from either version with a single click.

Image Merge Editor Names

Incoming / Current and branch names in the Merge Editor headings

The Merge Editor now makes it easier to parse conflicts by better aligning matching lines, displaying word level differences, and making differing whitespace visible. We’ve also reduced the clutter around the zoom margin, health margin, and toolbar. Further, you can turn off non-conflicting differences to just focus on the conflicts. And if you don’t need the horsepower of the Merge Editor, such as in Add/Add conflicts, you can resolve those now at the file level with a two-way merge.

Image gif of merge editor

Merge editor experience

Brand NEW Git Repository window

After we launched the first version of the Git Changes tool window, we wanted to make sure we incorporated community feedback and suggestions as we iterated on the experience. Our research informed us there are specific Git operations most of you perform while coding that made sense in the Git Changes window adjacent to your editor. But other times, you need a full-screen experience to focus on a dedicated Git activity. So, in Version 16.7 Preview 3, we built the Git Repository window, the future home for all your Git related activities. It’s now available in Visual Studio Preview, with some initial functionality.

First, we built an interactive branch tree where you can manage all the branches in the repository in a single view. From here you can use the context menu to Fetch, Pull, and Push branches without having to check them out. You can also create a new branch directly from any local or remote branch. We’ve also added the commands to Reset, Cherry-Pick, and Unset Upstream Branch, which weren’t available in the Git Changes branch picker.

In addition to using the power-packed context menu, you can also double click a branch in the list to show you its history in the right pane. At the top of the graph, you can see incoming commits after performing Fetch. Soon, you’ll be able to see outgoing commits as well. Double clicking on a commit will open its metadata in the Commit Details pane. You can access this window through the Manage Branches command in the Git menu as well as the Unpushed Commits button in the Status Bar

This is just the first iteration of the Git Repository window and we will continue to build more features into it. But in the meantime, we’re eager for you all to try it out and let us know what you think.

Image Git Repo window

Manage branches and view history from the Git Repository window

Additional updates

Create a repository

You can now create a new repository on GitHub, Azure Repos, or any remote URL at any time, even from an empty folder. Visual Studio will help you initialize the new repository locally as well as push it to your remote GitHub account. Use the existing remote option to push your code to a hosted Git repository you’ve already created.

Image Create a new repo

Create a new repository and push it to GitHub

Git Settings

It’s super important to be able to personalize and customize your Git settings at a repository level as well as at a global level. We’ve migrated all your settings to Tools – Options – Source Control.

Image Image of settings pane

Git settings

Streamlined Push

Along the lines of better error management, we’ve enhanced the Push experience so that if you Push changes before pulling upstream changes, you get options to Force Push or Pull and Push. To Force Push, you first need to enable ‘push –force’ in your Git settings.

Image Streamlined Push dialog

Dialog to help with Pushing commits

Git Changes window

We’ve been improving the new Git Changes window that we first introduced in Version 16.6. We enhanced the branch picker by adding special icons to more easily differentiate between remote branches, local branches tracking a remote, and local branches not tracking a remote.

Image Git Changes Ref Picker

Branch Picker in Git Changes window

Work Items

And finally, when the new Git experience is enabled, work items and builds can still be accessed from Team Explorer.

Image Work items in Team Explorer

Team Explorer Home page with Work Items and Builds

Wrapping up

As you can hopefully tell, we’ve been spending a bit of time to improve this experience. We see that remote work and collaboration are becoming more important than ever. And that’s why we continue to invest in these areas. Let us know in the comments what you think and what you’d additionally like to see here. We track all our customer asks in Suggestion Tickets on the Developer Community portal. Even though we sometimes don’t get to all of them immediately, we really appreciate the suggestions you make. And we do enjoy engaging in design conversations on the portal. Thank you for the ongoing feedback; you keep us honest and make us better.

Stay safe. Stay healthy.

103 comments

Comments are closed. Login to edit/delete your existing comments

  • Odysseas Vangelis
    Odysseas Vangelis

    I enabled the preview in VS Community 16.6.3 but i only get a Git window – Not a Git Changes one. Cant seem to find all the functionality that was organized under Team Explorer. Also no icons next to the branch names to show me which track a remote branch. Sync section is nowhere to be found. I cant seem to find Manage Branches anywhere, so i can fetch remote ones. The git repo window doesnt exist (is this only on the Preview version?).

    It doesnt seem like the changes make things easier and more streamlined, unless all these are only available in the Preview Version.

  • Avatar
    Tiago Rente

    One feature I use from Git Extensions is to be able to see all remote branches that have changes.
    It would be good to be able pull the changes to all local branches without a need to checkout each one and do a pull manually. Of course, if there are conflicts a manual merge may be needed.

    • Avatar
      Pratik NadagoudaMicrosoft employee

      You can use the Fetch button to fetch incoming changes from all branches on your remote. You would still need to Pull each branch individually. Thanks for the feedback!

  • Avatar
    Shimmy Weitzhandler

    The new Git experience definitely seems the way to go. However, it’s lacking some features too crucial to me.
    Here‘s my feedback in the Developer Community.

  • Avatar
    David McClelland

    Is there a link in the new Git experience where I can click to go to my Azure DevOps repo in a browser? If there is, I cannot find it 🙁

  • Avatar
    Richard Deeming

    With the new features enabled, there doesn’t seem to be any way to push to a secondary remote. The only option is to push to “origin”. Surely that can’t be right?!

  • Avatar
    banderson@quantros.com

    I appreciate the effort in trying to improve the git integration with VS. However, this is lacking one big piece. When you switch branches, do a pull it is difficult to tell if those operations completed successfully. When a build is running there is an indication in the footer bar that it finished. Why can’t you do something like that for a pull or switching branches? Right now you have to open up the Output window, select Git from the drop down, and watch it carefully to be sure it’s something new from the last time since there are no timestamps.

    • Avatar
      Pratik NadagoudaMicrosoft employee

      You should be able to see the success notification at the top of the Git Changes tool window. Please ‘Report a problem’ if you’re not seeing it, or if it’s not easily discoverable for your workflow.

  • Avatar
    banderson@quantros.com

    I noticed that when you click on the commits that haven’t been pushed in the footer, it doesn’t take you to the Git window like it used to take you to the Team Explorer so you can see those commits. Is that functionality going to come back?

    • Avatar
      Pratik NadagoudaMicrosoft employee

      Yes, that functionality is back! Clicking on ‘unpushed commits’ in the status bar will take you to the Git Repository window where you can see the outgoing commits for that branch. From there, you can look at commit details or directly push them.

  • Avatar
    Kuss, Wolfram

    Good work, thank you.

    Just a small niggle, but hopefully easy to fix:
    When committing and then pushing I need to copy the hash code so I can insert it into our bug tracking system and my work log.
    In the old workflow, I just selected the hash and Ctrl C.
    Now: Click on it, new window opens, select the hash, Ctrl C, close window.

    • Avatar
      Pratik NadagoudaMicrosoft employee

      If you click and Ctrl+C on the Commit in the branch history as well as in the Commit details pane, the hash code will get copied. So not sure, which UI are you trying to Ctrl+C the commit hash from?