Skip to content

Commit 66b3bf7

Browse files
authored
Merge pull request #9053 from MicrosoftDocs/users/chcomley/copilot-integration-repos
Copilot integration - Azure Repos
2 parents 9ad0f98 + bd97607 commit 66b3bf7

14 files changed

Lines changed: 42 additions & 0 deletions

docs/repos/git/branch-policies.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ms.assetid: 5D76697E-16A0-4048-91D1-806FE24C92A3
66
ms.service: azure-devops-repos
77
ms.topic: overview
88
ms.custom: cross-service, devx-track-azurecli
9+
ai-usage: ai-assisted
910
ms.date: 03/31/2022
1011
monikerRange: '<= azure-devops'
1112
ms.subservice: azure-devops-repos-git
@@ -15,6 +16,8 @@ ms.subservice: azure-devops-repos-git
1516

1617
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
Branch policies help teams protect their important [branches](./create-branch.md) of development. Policies enforce your team's code quality and change management standards. This article describes how to set and manage branch policies. For an overview of all repository and branch policies and settings, see [Git repository settings and policies](repository-settings.md).
1922

2023
A branch with required policies configured can't be deleted, and requires pull requests (PRs) for all changes.

docs/repos/git/commit-history.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ms.date: 03/14/2018
1010
monikerRange: '<= azure-devops'
1111
ms.subservice: azure-devops-repos-git
1212
ms.custom: sfi-image-nochange
13+
ai-usage: ai-assisted
1314
---
1415

1516

@@ -18,6 +19,8 @@ ms.custom: sfi-image-nochange
1819

1920
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
2021

22+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
23+
2124
## Commit history view
2225

2326
The commit history view shows you the history of all the commits for a particular branch in a repository. By default, all results are shown in reverse chronological order.

docs/repos/git/complete-pull-requests.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ ms.date: 03/31/2022
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
1111
ms.custom: devx-track-azurecli
12+
ai-usage: ai-assisted
1213
---
1314

1415
# Complete, abandon, or revert pull requests
1516

1617
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1718
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1819

20+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
21+
1922
Once all required reviewers approve your pull request (PR) and the PR meets all [branch policy](branch-policies.md) requirements, you can merge your changes into the target branch and [complete the PR](#complete-a-pull-request). Or if you decide not to proceed with the changes in the PR, you can [abandon the PR](#abandon-the-pr).
2023

2124
To address reviewers' changes, and respond to and resolve review comments, see [Address comments](review-pull-requests.md#address-comments).

docs/repos/git/create-branch.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: how-to
88
ms.date: 10/19/2022
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314
# Create a new Git branch
1415

1516
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1617
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
The first commit in a new Git repo is the start of the `main` branch. As you work in the `main` branch, you make commits to record your work in that branch. Branching in Git occurs when you create a new line of development that diverges from a prior branch. You might choose to create a new branch to develop and test a new feature before adding it to your `main` branch. The recommended [Git workflow](gitworkflow.md) is to use a new branch for every feature or bugfix. When you switch between branches, Git almost instantly switches the version of your repo files to match the branch you selected. Your [commits](commits.md) are always saved to the current branch, and are isolated from commits in other branches.
1922

2023
For an overview of the Git workflow, see [Azure Repos Git tutorial](gitworkflow.md).

docs/repos/git/forks.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: how-to
88
ms.date: 10/19/2022
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314
# Forks
1415

1516
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1617
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
Git repo forks are useful when people want to make experimental, risky, or concealed changes to a codebase, but those changes need to be isolated from the codebase in the original repo. A new fork is basically a new remote repo that shares the source code of the original repo.
1922

2023
As an independent version, changes you make to your fork, such as adding commits or branches, are hidden from the original repo. If you want to merge your codebase changes into the original repo, you must create a [pull request](pull-requests.md) (PR) to request review and approval of those changes.

docs/repos/git/history.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: overview
88
ms.date: 07/30/2018
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314

1415
# Understand Git history
1516

1617
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
Git stores history as a graph of snapshots &mdash; called commits &mdash; of the entire repository.
1922
Each commit also contains a pointer to one or more previous commits.
2023
Commits can have multiple parents, creating a history that looks like a graph instead of a straight line.

docs/repos/git/merging.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: tutorial
88
ms.date: 10/19/2022
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314
# Resolve merge conflicts
1415

1516
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1617
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
When you [merge or rebase](pulling.md#update-branches-with-merge-or-rebase), you're telling Git to integrate changes made on one branch with changes made on another. Often, Git completes a merge or rebase automatically without your assistance. However, if Git discovers that a change made on one branch conflicts with a change made on another, it prompts you to resolve the conflict. A merge conflict can occur when the merged branches edit the same file line differently, or when one branch modifies a file and another branch deletes it. The process for resolving merge conflicts is applicable to both Git merge and rebase.
1922

2023
You can resolve merge conflicts in Visual Studio, or by using the command line and any text editor.

docs/repos/git/pr-status-policy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: how-to
88
ms.date: 08/11/2020
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314

1415
# Configure a branch policy for an external service
1516

1617
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
Branch policies are a powerful feature to ensure high quality code in your repo by establishing requirements for all pull requests. External services can use the PR [Status API](/rest/api/azure/devops/git/pull%20request%20statuses) to post detailed status to your PRs. The branch policy for external services brings the ability for those 3rd party services to participate in the PR workflow and establish policy requirements. This article guides you through the process of configuring a branch policy for a service that is posting PR status. For more information about PR status, see [Customize and extend pull request workflows with pull request status](pull-request-status.md).
1922

2023
[!INCLUDE [note-tfs-2018.2-update](includes/note-tfs-2018.2-update.md)]

docs/repos/git/pull-requests.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ ms.date: 02/15/2025
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
1111
ms.custom: devx-track-azurecli
12+
ai-usage: ai-assisted
1213
---
1314

1415
# Create pull requests
1516

1617
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1718
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1819

20+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
21+
1922
Create pull requests (PRs) to change, review, and merge code in a [Git repository](creatingrepo.md). You can create PRs from branches in the upstream repository or from branches in your [fork](forks.md) of the repository. Your team can [review the PRs](review-pull-requests.md) and give feedback on changes. Reviewers can step through the proposed changes, leave comments, and vote to approve or reject the PRs. Depending on [branch policies](branch-policies.md) and other requirements, your PR might need to meet various criteria before you can [complete the PR](complete-pull-requests.md) and merge the changes into the target branch.
2023

2124
For PR guidelines and management considerations, see [About pull requests](about-pull-requests.md).

docs/repos/git/rebase.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ ms.topic: tutorial
88
ms.date: 10/18/2022
99
monikerRange: '<= azure-devops'
1010
ms.subservice: azure-devops-repos-git
11+
ai-usage: ai-assisted
1112
---
1213

1314
# Apply changes with rebase
1415

1516
[!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
1617
[!INCLUDE [version-vs-gt-eq-2019](../../includes/version-vs-gt-eq-2019.md)]
1718

19+
[!INCLUDE [ai-assistance-callout](../../includes/ai-assistance-callout.md)]
20+
1821
Git automatically maintains a [history](/devops/develop/git/understand-git-history) of development on a [branch](branch-policies-overview.md) by linking each new [commit](commits.md) to its predecessor. When you [merge](merging.md) one branch into another, the history can become less straightforward. For example, a [no-fast-forward merge](https://git-scm.com/docs/git-merge#_true_merge) combines divergent lines of development by creating a merge commit with multiple predecessors. Conversely, a Git [rebase](https://git-scm.com/docs/git-rebase) combines divergent lines of development without creating a merge commit, which results in a simpler commit history but loses information about the merge. Your choice of [merge type](pulling.md#update-branches-with-merge-or-rebase) is likely influenced by whether you want to preserve a record of the merge or simplify the commit history.
1922

2023
This article discusses when to use a rebase instead of a no-fast-forward merge, and provides procedures for the following tasks:

0 commit comments

Comments
 (0)