Merge branch 'main' into docs-issue-cross-referencing-42376

Author: XiaoPengMei

Dockerfile

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260218-111945-g0ef8bb15f@sha256:03eb088f3581049afaf2984f917a3a9be7e5efc248049f4156cd83481579fb59 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260320-170214-g814cb7830@sha256:90350e63f9b56ec3f60f5ef9f51b489c4eef6462c7727e0d6729a1c8d95a4aa7 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/actions/how-tos/manage-runners/larger-runners/use-custom-images.md

@@ -10,8 +10,6 @@ category:
 contentType: how-tos
 ---
 
-{% data reusables.actions.custom-images-public-preview-note %}
-
 ## Custom images
 
 You can create a custom image to define the exact environment that your {% data variables.actions.github_hosted_larger_runners %} use. Custom images let you preinstall tools, dependencies, and configurations to speed up workflows and improve consistency across jobs.

content/code-security/concepts/index.md

@@ -14,3 +14,4 @@ children:
   - supply-chain-security
   - /vulnerability-reporting-and-management
   - /security-at-scale
+---

content/copilot/concepts/agents/coding-agent/about-coding-agent.md

@@ -30,6 +30,7 @@ With {% data variables.copilot.copilot_coding_agent %}, {% data variables.produc
 * Improve test coverage
 * Update documentation
 * Address technical debt
+* Resolve merge conflicts
 
 To delegate tasks to {% data variables.copilot.copilot_coding_agent %}, you can:
 

content/copilot/how-tos/administer-copilot/manage-for-enterprise/index.md

@@ -11,9 +11,11 @@ children:
   - /manage-agents
   - /manage-spark
   - /use-your-own-api-keys
+  - /review-audit-logs
 redirect_from:
   - /copilot/managing-copilot/managing-copilot-for-your-enterprise
   - /copilot/how-tos/administer/enterprises
   - /copilot/how-tos/administer/manage-for-enterprise
 contentType: how-tos
 ---
+

content/copilot/how-tos/administer-copilot/manage-for-enterprise/review-audit-logs.md

@@ -0,0 +1,55 @@
+---
+title: Reviewing audit logs for GitHub Copilot
+shortTitle: Review audit logs
+intro: Check for changes to settings or licenses in your {% data variables.product.prodname_copilot_short %} plan.
+product: '{% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %}'
+permissions: Enterprise owners or users with the "Read enterprise audit logs" custom role
+redirect_from:
+  - /copilot/managing-copilot-for-business/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-for-business
+  - /copilot/managing-copilot-business/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-business
+  - /copilot/managing-github-copilot-in-your-organization/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-business
+  - /copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-github-copilot-activity-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization/review-audit-logs
+  - /copilot/how-tos/administer/organizations/review-activity/review-audit-logs
+  - /copilot/how-tos/administer/manage-for-organization/review-activity/review-audit-logs
+  - /copilot/how-tos/administer-copilot/manage-for-organization/review-activity/review-audit-logs
+versions:
+  feature: copilot
+contentType: how-tos
+category:
+  - Manage Copilot for a team
+---
+
+You can use the audit log to review actions taken in your enterprise. The audit log includes a record of:
+
+* Changes to your {% data variables.product.prodname_copilot_short %} plan, such as changes to settings and policies or a user losing or receiving a license
+* Agent activity on the {% data variables.product.github %} website
+
+The audit log does **not** include client session data, such as the prompts a user sends to {% data variables.product.prodname_copilot_short %} locally. A custom solution is required to access this data: for example, some companies use custom hooks to send {% data variables.copilot.copilot_cli_short %} events to their own logging service.
+
+## Viewing your enterprise's audit logs
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.audit-log-tab %}
+
+## Searching audit log events
+
+Use the `action:copilot` search term to view all events related to your {% data variables.product.prodname_copilot_short %} plan.
+
+You can also filter by a specific event. For example, `action:copilot.cfb_seat_assignment_created` returns events related to a license being assigned to a new user. For a full list of {% data variables.product.prodname_copilot_short %} events, see [AUTOTITLE](/enterprise-cloud@latest/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#copilot) or [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization#copilot).
+
+To view a record of agent activity, use the `actor:Copilot` search term. See [AUTOTITLE](/copilot/reference/agentic-audit-log-events).
+
+## Retaining audit log history
+
+The audit log retains events for the last 180 days. We recommend streaming the audit log to a Security Information and Event Management (SIEM) platform, where you can view long-term history and set up alerts for anomalous activity. See [AUTOTITLE](/enterprise-cloud@latest/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise).
+
+## Further reading
+
+* [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)

content/copilot/how-tos/administer-copilot/manage-for-organization/review-activity/index.md

@@ -1,12 +1,11 @@
 ---
 title: Reviewing activity related to GitHub Copilot in your organization
 shortTitle: Review activity
-intro: 'Organization owners can review {% data variables.product.prodname_copilot_short %} usage in their organization.'
+intro: Organization owners can review {% data variables.product.prodname_copilot_short %} usage in their organization.
 versions:
   feature: copilot
 children:
   - /review-user-activity-data
-  - /review-audit-logs
 redirect_from:
   - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization
   - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization

content/copilot/how-tos/administer-copilot/manage-for-organization/review-activity/review-audit-logs.md

@@ -22,6 +22,12 @@ By default, {% data variables.product.prodname_copilot_short %} pushes commits d
 
 If you prefer {% data variables.product.prodname_copilot_short %} to create a separate pull request instead, you can ask for this using natural language in your comment—for example, "open a PR to fix the tests."
 
+## 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."
+
+{% 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.
+
 ## Asking {% data variables.product.prodname_copilot_short %} to make changes
 
 1. Navigate to the pull request that you want {% data variables.product.prodname_copilot_short %} to make changes to.

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

@@ -64,7 +64,10 @@ Issues that you may choose to work on yourself, rather than assigning to {% data
 
 Working with {% data variables.product.prodname_copilot_short %} on a pull request is just like working with a human developer: it's common for the pull request to need further work before it can be merged. The process for getting the pull request to a mergeable state is exactly the same when the pull request is created by {% data variables.product.prodname_copilot_short %} as when it's created by a human.
 
-You can also mention `@copilot` in comments on the pull request—explaining what you think is incorrect, or could be improved—and {% data variables.product.prodname_copilot_short %} will push commits directly to the pull request's branch. Alternatively, you can work on the feature branch yourself and push changes to the pull request.
+Additionally, you can:
+* Mention `@copilot` in comments on the pull request, explaining what you think is incorrect, or could be improved, and {% data variables.product.prodname_copilot_short %} will push commits directly to the pull request's branch. 
+* Ask {% data variables.product.prodname_copilot_short %} to resolve merge conflicts on the pull request. See [AUTOTITLE](/copilot/how-tos/use-copilot-agents/coding-agent/make-changes-to-an-existing-pr#resolving-merge-conflicts). 
+* Work on the feature branch yourself and push changes to the pull request.
 
 After a user with write access mentions `@copilot` in a comment, {% data variables.product.prodname_copilot_short %} will start to make any required changes, and will update the pull request when it's done. Because {% data variables.product.prodname_copilot_short %} starts looking at comments as soon as they are submitted, if you are likely to make multiple comments on a pull request it's best to batch them by clicking **Start a review**, rather than clicking **Add single comment**. You can then submit all of your comments at once, triggering {% data variables.product.prodname_copilot_short %} to work on your entire review, rather than working on individual comments separately.