Skip to content

Commit 22c594c

Browse files
Merge pull request #10476 from TerryGLee/tglee-fresh19
verify as fresh & run Acrolinx pass
2 parents 240940b + 4e78b52 commit 22c594c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/version-control/git-resolve-conflicts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Resolve merge conflicts in Visual Studio
33
titleSuffix: ""
44
description: Understanding, preventing, and resolving merge conflicts in Visual Studio.
5-
ms.date: 11/10/2021
5+
ms.date: 10/05/2022
66
ms.topic: how-to
77
author: Taysser-Gherfal
88
ms.author: tglee
@@ -35,7 +35,7 @@ Git is good at automatically merging file changes in most circumstances, as long
3535

3636
## Resolve merge conflicts
3737

38-
- If you're collaborating with others in the same branch, you might get merge conflicts when you push your changes.
38+
- If you're collaborating with others in the same branch, you might see merge conflicts when you push your changes.
3939

4040
:::image type="content" source="media/vs-2022/git-conflicts-push-link.png" alt-text="Screenshot of merge conflict after a push.":::
4141

0 commit comments

Comments
 (0)