Merge pull request #9511 from MicrosoftDocs/main638271130473652606sync_temp

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docs/ide/media/vs-2022/file-comparison.png

@@ -1,7 +1,7 @@
 ---
 title: Learn about Solution Explorer
 description: Learn how you can use Solution Explorer and its context menu to manage the projects and files in a solution.
-ms.date: 04/21/2023
+ms.date: 08/08/2023
 ms.topic: conceptual
 ms.custom: contperf-fy22q4
 helpviewer_keywords:
@@ -131,6 +131,20 @@ Visual Studio remembers your choice so that you get the experience that best sui
 > [!TIP]
 > You can configure the [keyboard shortcuts](default-keyboard-shortcuts-in-visual-studio.md) for the **Project.AddNewItem** command and the **AddQuickFile** command from **Tools** > **Options** > **Environment** > **Keyboard**.
 
+## File comparison
+
+Starting with the Visual Studio 2022 version [17.7](/visualstudio/releases/2022/release-notes/) release, you can now select two files in Solution Explorer and compare them by using the new **Compare Selected** option.
+
+:::image type="content" source="media/vs-2022/file-comparison.png" alt-text="Screenshot of the file comparison tool from the right-click context menu in Solution Explorer.":::
+
+You can compare files in the following ways: 
+
+- Multi-select two files by holding down the **Ctrl** button and then right-clicking and selecting the **Compare Selected** from the context menu. 
+- Right-click a single file (for example, `File1`) and then select the **Select for Compare** option from the context menu. Then, navigate to the second file (for example, `File2`) in Solution Explorer, right-click the second file, and press **Compare with File1**.
+- Right-click a single file, select **Compare With…** from the context menu, which opens File Explorer. Navigate to any file and select it for comparison. 
+
+No matter which way you choose to compare your files, the file comparison tool should make it easier to compare your files without having to leave your IDE.
+
 ::: moniker-end
 
 ## See also

docs/ide/use-solution-explorer.md

@@ -2,7 +2,7 @@
 title: "What's new in Visual Studio 2022"
 titleSuffix: ""
 description: "Learn about the new features in Visual Studio 2022."
-ms.date: 05/16/2023
+ms.date: 08/18/2023
 helpviewer_keywords:
   - "Visual Studio, what's new"
   - "what's new [Visual Studio]"
@@ -19,7 +19,7 @@ ms.workload:
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
-**Updated for the 17.6 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
+**Updated for the 17.7 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
 
 >[!div class="button"]
 >[Download Visual Studio 2022](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta)

docs/ide/whats-new-visual-studio-2022.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.prod: visual-studio-windows
 ms.technology: vs-installation
 ms.topic: include
@@ -21,7 +21,7 @@ ms.topic: include
 
 Component ID | Name | Version | Dependency type
 --- | --- | --- | ---
-Microsoft.VisualStudio.Component.CoreEditor | Visual Studio core editor | 17.6.33605.316 | Required
+Microsoft.VisualStudio.Component.CoreEditor | Visual Studio core editor | 17.7.33905.399 | Required
 
 ## Unaffiliated components
 

docs/install/includes/vs-2022/workload-component-id-vs-build-tools.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.prod: visual-studio-windows
 ms.technology: vs-installation
 ms.topic: include
@@ -21,7 +21,7 @@ ms.topic: include
 
 Component ID | Name | Version | Dependency type
 --- | --- | --- | ---
-Microsoft.VisualStudio.ComponentGroup.TestTools.TestAgent | Test Agent core features | 17.6.33605.316 | Required
+Microsoft.VisualStudio.ComponentGroup.TestTools.TestAgent | Test Agent core features | 17.7.33905.399 | Required
 
 ## Unaffiliated components
 

docs/install/includes/vs-2022/workload-component-id-vs-community.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.prod: visual-studio-windows
 ms.technology: vs-installation
 ms.topic: include
@@ -21,7 +21,7 @@ ms.topic: include
 
 Component ID | Name | Version | Dependency type
 --- | --- | --- | ---
-Microsoft.VisualStudio.ComponentGroup.TestTools.TestController | Test Controller core features | 17.6.33605.316 | Required
+Microsoft.VisualStudio.ComponentGroup.TestTools.TestController | Test Controller core features | 17.7.33905.399 | Required
 
 ## Unaffiliated components
 

docs/install/includes/vs-2022/workload-component-id-vs-enterprise.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.custom: vs-acquisition
 ms.topic: reference
 helpviewer_keywords:
@@ -48,7 +48,7 @@ For more information about how to use these lists, see the [Use command-line par
 
 ::: moniker range=">=vs-2022"
 
-**Updated for the [17.6 release](/visualstudio/releases/2022/release-notes/)**
+**Updated for the [17.7 release](/visualstudio/releases/2022/release-notes/)**
 
 | **Edition** | **ID** | **Description** |
 | ----------- | ------ | --------------- |

docs/install/includes/vs-2022/workload-component-id-vs-professional.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/includes/vs-2022/workload-component-id-vs-team-explorer.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/includes/vs-2022/workload-component-id-vs-test-agent.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/includes/vs-2022/workload-component-id-vs-test-controller.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/workload-and-component-ids.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/workload-component-id-vs-build-tools.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/workload-component-id-vs-community.md

@@ -6,7 +6,7 @@ keywords:
 author: anandmeg
 ms.author: meghaanand
 manager: jmartens
-ms.date: 05/16/2023
+ms.date: 08/08/2023
 ms.topic: reference
 helpviewer_keywords:
 - workload ID, Visual Studio

docs/install/workload-component-id-vs-enterprise.md

@@ -1,7 +1,7 @@
 ---
 title: "Browse repos, compare branches & commits"
 description: Browse any Git repository in Visual Studio by using the Git Repository window.
-ms.date: 06/07/2023
+ms.date: 08/08/2023
 ms.topic: how-to
 author: houghj16
 ms.author: tglee
@@ -31,8 +31,9 @@ The **Git Repository** window contains three main sections, as numbered in the p
 
    - **Incoming** shows incoming commits that your team has been contributing.
    - **Outgoing** shows your local commits that you still haven't pushed.
-   - **Local History** shows the rest of commits tracked by your local repository.
-1. **Commit**: Selecting any commit in the **Graph** section opens its details. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Files.csproj* file.
+   - **Local History** shows the rest of commits tracked by your local repository. 
+
+1. **Commit**: Selecting any commit in the **Graph** section opens its details. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Resize.cs* file.
 
 The **Alt**+**Up arrow** or **Alt**+**Down arrow** keyboard shortcuts allow you to jump between these sections.
 
@@ -47,6 +48,14 @@ You can browse through any local or remote branch without having to switch your
 >
 > :::image type="content" source="media/vs-2022/git-repository-commit-details-full-screen.png" alt-text="Screenshot of full-screen commit details with diff configurations." lightbox="media/vs-2022/git-repository-commit-details-full-screen.png":::
 
+### Multi-branch graph view
+
+**[New with version 17.7](/visualstudio/releases/2022/release-notes)**: When you open the Git Repo window, you start in the single branch view. You can then select any branch to add both the branch and its commits to a multi-branch graph view, which adds visual cues that make it more efficient to interact with multiple branches. 
+
+:::image type="content" source="media/vs-2022/git-repository-multigraph-branch-view.png" alt-text="Screenshot of the multi-graph branch view in Visual Studio." lightbox="media/vs-2022/git-repository-multigraph-branch-view.png":::
+
+There's both line coloring and branch labels on the left side of the **Local History** view that help make it easier to trace which commits belong to each branch. You can use the list of branches at the top of the table to scroll between branches more easily and know immediately which branches appear in the graph.
+
 <a name="compare-commits"/>
 
 ## Compare commits
@@ -116,4 +125,4 @@ To continue your journey, see [Manage Git repositories in Visual Studio](git-man
 ## See also
 
 - [The Git experience in Visual Studio](git-with-visual-studio.md)
-- [Visual Studio and GitHub: Better together](https://visualstudio.microsoft.com/vs/github/)
+- [Visual Studio and GitHub: Better together](https://visualstudio.microsoft.com/vs/github/)