Repo sync

content/admin/data-residency/github-copilot-with-data-residency.md

@@ -0,0 +1,74 @@
+---
+title: GitHub Copilot with data residency
+shortTitle: GitHub Copilot
+intro: "Keep AI-powered coding assistance within your designated region, so you can meet compliance requirements while improving developer productivity."
+versions:
+  ghec: '*'
+category:
+  - Get started with GitHub Enterprise
+product: '{% data variables.enterprise.data_residency %}'
+---
+
+If your enterprise uses {% data variables.enterprise.data_residency %}, you can enable a policy to ensure that all inference processing and associated data for {% data variables.product.prodname_copilot %} remain **within your designated geographic region**.
+
+## Supported regions
+
+{% data variables.product.prodname_copilot_short %} with data residency is currently available in the following regions:
+
+* United States
+* European Union
+
+{% data variables.product.company_short %} plans to add support for more regions in the near future.
+
+## How restrictions are enforced
+
+When you enforce data residency for {% data variables.product.prodname_copilot_short %}, {% data variables.product.company_short %} routes all {% data variables.product.prodname_copilot_short %} requests to model endpoints within your enterprise's designated region. Your code, prompts, and {% data variables.product.prodname_copilot_short %} responses never leave your region during inference processing.
+
+The enforcement happens at multiple levels:
+
+* **Authentication and routing**: Users' authentication tokens only grant access to your region-specific endpoints, ensuring that traffic never leaves the designated geography.
+* **Model availability**: {% data variables.product.prodname_copilot_short %} will only surface models that are certified and available in your region. Developers cannot access models hosted outside your region.
+* **Logs and telemetry**: All {% data variables.product.prodname_copilot_short %}-related logs and telemetry are stored within region-appropriate, compliant storage.
+
+## Client version requirements
+
+{% data reusables.copilot.model-compliance.client-requirements %}
+
+## Supported {% data variables.product.prodname_copilot_short %} features
+
+{% data reusables.copilot.model-compliance.supported-features %}
+
+## Available AI models by region
+
+The models available for {% data variables.product.prodname_copilot_short %} vary by region. {% data reusables.copilot.model-compliance.models-intro %}
+
+### United States
+
+{% data reusables.copilot.model-compliance.us-models %}
+
+### European Union
+
+* GPT-4o mini
+* GPT-4.1
+* GPT-5 mini
+* GPT-5.1
+* GPT-5.1-Codex
+* GPT-5.1-Codex-Max
+* GPT-5.2
+* GPT-5.4
+* Claude Haiku 4.5
+* Claude Sonnet 4
+* Claude Sonnet 4.5
+* Claude Opus 4.5
+* Claude Sonnet 4.6
+* Claude Opus 4.6
+
+## Pricing changes
+
+{% data reusables.copilot.model-compliance.pricing-changes %}
+
+## Policy controls
+
+To enable this policy, use the **Restrict {% data variables.product.prodname_copilot_short %} to data residency compliant models** policy in the "Features" section of your enterprise's {% data variables.product.prodname_copilot_short %} policies. This policy is disabled by default, and enabling it will affect your pricing for {% data variables.product.prodname_copilot_short %} requests.
+
+For instructions on finding your policies page, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-enterprise-policies).

content/admin/data-residency/index.md

@@ -8,6 +8,7 @@ children:
   - /about-storage-of-your-data-with-data-residency
   - /feature-overview-for-github-enterprise-cloud-with-data-residency
   - /getting-started-with-data-residency-for-github-enterprise-cloud
+  - /github-copilot-with-data-residency
   - /network-details-for-ghecom
   - /resolving-issues-with-your-enterprise-on-ghecom
 redirect_from:

content/copilot/concepts/billing/copilot-requests.md

@@ -101,6 +101,8 @@ If you use **{% data variables.copilot.copilot_free_short %}**, you have access
 
 {% data reusables.copilot.model-multipliers %}
 
+**For {% data variables.product.prodname_ghe_cloud %}**, requests processed with data residency or FedRAMP enforcement include an additional 10% multiplier. See [AUTOTITLE](/admin/data-residency/github-copilot-with-data-residency#pricing-for-data-resident-copilot).
+
 ## Examples of premium request usage
 
 Premium request usage is based on the model’s multiplier and the feature you’re using. For example:

content/copilot/concepts/billing/organizations-and-enterprises.md

@@ -28,7 +28,11 @@ category:
 * **{% data variables.copilot.copilot_business_short %}** at {% data variables.copilot.cfb_price_per_month %} per user per month (Purchase additional premium requests at {% data variables.copilot.additional_premium_requests %} per request)
 * **{% data variables.copilot.copilot_enterprise_short %}** at {% data variables.copilot.ce_price_per_month %} per user per month ({% data variables.product.prodname_ghe_cloud %} only, purchase additional premium requests at {% data variables.copilot.additional_premium_requests %} per request)
 
-With {% data variables.product.prodname_ghe_cloud %}, an enterprise owner chooses the plan for each organization in the enterprise. For guidance on choosing a plan, see [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/choosing-your-enterprises-plan-for-github-copilot).
+With {% data variables.product.prodname_ghe_cloud %}:
+
+* An enterprise owner chooses the plan for each organization in the enterprise. For guidance on choosing a plan, see [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/choosing-your-enterprises-plan-for-github-copilot).
+
+* Data-resident and FedRAMP-compliant {% data variables.product.prodname_copilot_short %} requests include a 10% model multiplier increase. See [AUTOTITLE](/admin/data-residency/github-copilot-with-data-residency#pricing-for-data-resident-copilot).
 
 ## Premium requests
 

content/copilot/concepts/context/mcp.md

@@ -69,6 +69,8 @@ The {% data variables.product.github %} MCP server is a Model Context Protocol (
 
 To learn how to set up and use the {% data variables.product.github %} MCP server, see [AUTOTITLE](/copilot/how-tos/context/model-context-protocol/using-the-github-mcp-server).
 
+To find out whether your editor supports the {% data variables.product.github %} MCP server, and which connection and authentication methods are available, see [Support by host application](https://github.com/github/github-mcp-server/blob/main/docs/installation-guides/README.md#support-by-host-application) in the `github/github-mcp-server` repository.
+
 ### Remote access
 
 You can access the {% data variables.product.github %} MCP server remotely through {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode %} without any local setup. The remote server has access to additional toolsets only available in the remote {% data variables.product.github %} MCP server. For a list of such tools, see [Additional toolsets](https://github.com/github/github-mcp-server?tab=readme-ov-file#additional-toolsets-in-remote-github-mcp-server) in the `github/github-mcp-server` repository.

content/copilot/concepts/fedramp-models.md

@@ -0,0 +1,37 @@
+---
+title: FedRAMP-compliant models for GitHub Copilot
+shortTitle: FedRAMP models
+intro: "Restrict users to models with FedRAMP Moderate certification."
+versions:
+  feature: copilot
+product: '{% data variables.enterprise.data_residency %}'
+contentType: concepts
+---
+
+If your enterprise uses {% data variables.enterprise.data_residency %} in the US, you can enable a policy to ensure that users on your {% data variables.product.prodname_copilot_short %} plan can only use models with **FedRAMP Moderate** certification.
+
+## Available models
+
+{% data reusables.copilot.model-compliance.models-intro %}
+
+Enabling the FedRAMP policy restricts users to the following models:
+
+{% data reusables.copilot.model-compliance.us-models %}
+
+## Client version requirements
+
+{% data reusables.copilot.model-compliance.client-requirements %}
+
+## Supported {% data variables.product.prodname_copilot_short %} features
+
+{% data reusables.copilot.model-compliance.supported-features %}
+
+## Pricing changes
+
+{% data reusables.copilot.model-compliance.pricing-changes %}
+
+## Policy controls
+
+To enable this policy, use the **Restrict {% data variables.product.prodname_copilot_short %} to FedRAMP models** policy in the "Features" section of your enterprise's {% data variables.product.prodname_copilot_short %} policies. This policy is disabled by default, and enabling it will affect your pricing for {% data variables.product.prodname_copilot_short %} requests.
+
+For instructions on finding your policies page, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-enterprise-policies).

content/copilot/concepts/index.md

@@ -19,6 +19,7 @@ children:
   - /about-enterprise-accounts-for-copilot-business
   - /policies
   - /mcp-management
+  - /fedramp-models
   - /network-settings
   - /fallback-and-lts-models
 contentType: concepts

content/copilot/get-started/what-is-github-copilot.md

@@ -42,6 +42,12 @@ You can use {% data variables.product.prodname_copilot_short %} to:
 * Generate descriptions of changes in a pull request.
 * Research, plan, make code changes, and create pull requests for you to review. Available in {% data variables.copilot.copilot_pro_plus_short %}, {% data variables.copilot.copilot_business_short %}, and {% data variables.copilot.copilot_enterprise_short %} only.
 
+{% ifversion ghec %}
+
+**For enterprises and organizations with data residency requirements:** If you use {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_copilot_short %} can enforce geographic data residency. See [AUTOTITLE](/admin/data-residency/github-copilot-with-data-residency).
+
+{% endif %}
+
 Use {% data variables.product.prodname_copilot_short %} in the following places:
 
 * Your IDE

content/copilot/how-tos/use-copilot-agents/cloud-agent/make-changes-to-an-existing-pr.md

@@ -26,7 +26,10 @@ If you prefer {% data variables.product.prodname_copilot_short %} to create a se
 
 ## Resolving merge conflicts
 
-You can ask {% data variables.product.prodname_copilot_short %} to resolve merge conflicts on a pull request by mentioning `@copilot` and asking it to fix the conflicts using natural language, such as "@copilot resolve the merge conflicts on this PR."
+You can ask {% data variables.product.prodname_copilot_short %} to resolve merge conflicts on a pull request in two ways:
+
+* **Using the "Fix with {% data variables.product.prodname_copilot_short %}" button**: If a pull request has merge conflicts, click the **Fix with {% data variables.product.prodname_copilot_short %}** button that appears in the merge box. This button is available if you have access to {% data variables.copilot.copilot_cloud_agent %} and it is enabled for the repository.
+* **Using an @copilot mention**: Mention `@copilot` in a comment on the pull request and ask it to fix the conflicts using natural language, such as "@copilot resolve the merge conflicts on this PR."
 
 {% data variables.product.prodname_copilot_short %} will analyze the conflicting changes, resolve the conflicts, and ensure the build, tests, and linter still pass. Once it has finished, {% data variables.product.prodname_copilot_short %} will request your review so you can verify the conflict resolution before merging.
 

content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md

@@ -24,6 +24,9 @@ To resolve a merge conflict, you must manually edit the conflicted file to selec
 
 * If your merge conflict is caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository, you can resolve it on {% data variables.product.github %} using the conflict editor. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github).
 * For all other types of merge conflicts, you must resolve the merge conflict in a local clone of the repository and push the change to your branch on {% data variables.product.github %}. You can use the command line or a tool like [{% data variables.product.prodname_desktop %}](https://desktop.github.com/) to push the change. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line).
+{% ifversion copilot %}
+* For any type of merge conflict, if you have access to {% data variables.copilot.copilot_cloud_agent %} and it is enabled for the repository, you can click **Fix with {% data variables.product.prodname_copilot_short %}** in the merge box to have {% data variables.product.prodname_copilot_short %} resolve the conflicts for you. {% data variables.product.prodname_copilot_short %} will analyze the conflicting changes, resolve the conflicts, and verify that the build, tests, and linter still pass. For more information, see [AUTOTITLE](/copilot/how-tos/use-copilot-agents/cloud-agent/make-changes-to-an-existing-pr#resolving-merge-conflicts).
+{% endif %}
 
 If you have a merge conflict on the command line, you cannot push your local changes to {% data variables.product.github %} until you resolve the merge conflict locally on your computer. If you try merging branches on the command line that have a merge conflict, you'll get an error message. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line).
 

content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md

@@ -17,6 +17,12 @@ category:
 ---
 You can only resolve merge conflicts on {% data variables.product.github %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line).
 
+{% ifversion copilot %}
+
+If you have access to {% data variables.copilot.copilot_cloud_agent %} and it is enabled for the repository, you can click **Fix with {% data variables.product.prodname_copilot_short %}** in the merge box to have {% data variables.product.prodname_copilot_short %} resolve the merge conflicts automatically. {% data variables.product.prodname_copilot_short %} will analyze the conflicting changes, resolve the conflicts, and verify that the build, tests, and linter still pass. For more information, see [AUTOTITLE](/copilot/how-tos/use-copilot-agents/cloud-agent/make-changes-to-an-existing-pr#resolving-merge-conflicts).
+
+{% endif %}
+
 {% ifversion ghes %}
 If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.prodname_ghe_server %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository.
 {% endif %}

data/reusables/copilot/model-compliance/client-requirements.md

@@ -0,0 +1,3 @@
+To use {% data variables.product.prodname_copilot_short %} with model enforcement, developers must use compatible client versions. Generally, any {% data variables.product.prodname_copilot_short %} extension or CLI version released in 2025 or later includes the necessary policy enforcement capabilities.
+
+If a user attempts to use {% data variables.product.prodname_copilot_short %} with an older, incompatible client, they will be prompted to update their extension or CLI to continue.

data/reusables/copilot/model-compliance/models-intro.md

@@ -0,0 +1,4 @@
+Users will be able to see available models for your region in the model selector in their {% data variables.product.prodname_copilot_short %} interface.
+
+> [!NOTE]
+> Model availability changes over time. New models released on {% data variables.product.prodname_dotcom_the_website %} may take additional time to become available as providers deploy regional infrastructure and obtain necessary certifications.

data/reusables/copilot/model-compliance/pricing-changes.md

@@ -0,0 +1,5 @@
+{% data variables.product.prodname_copilot_short %} requests processed with this enforcement in place include a 10% model multiplier increase. This reflects the additional infrastructure costs that model providers charge for regional and compliance-certified endpoints.
+
+For example, if a model normally counts as 1 premium request, the same model processed with this enforcement enabled counts as 1.1 premium requests. This pricing applies to all compliant model requests across all providers.
+
+See [AUTOTITLE](/copilot/concepts/billing/copilot-requests#model-multipliers).

data/reusables/copilot/model-compliance/supported-features.md

@@ -0,0 +1,3 @@
+All generally available {% data variables.product.prodname_copilot_short %} features work with this enforcement. See [AUTOTITLE](/copilot/get-started/features).
+
+Preview features that reach general availability will be supported with compliant model alternatives at the time of their GA release.

data/reusables/copilot/model-compliance/us-models.md

@@ -0,0 +1,16 @@
+<!-- Note: US data resident and FedRAMP compliant models are currently the same, but this may not always be the case. However, we should be able to add new models after this reusable reference in the relevant article -->
+* GPT-4o mini
+* GPT-4o
+* GPT-4.1
+* GPT-5.1
+* GPT-5.1-Codex
+* GPT-5.1-Codex-Max
+* GPT-5.2
+* GPT-5.2-Codex
+* GPT-5.3-Codex
+* Claude Haiku 4.5
+* Claude Sonnet 4
+* Claude Sonnet 4.5
+* Claude Opus 4.5
+* Claude Sonnet 4.6
+* Claude Opus 4.6