From 3b160f0a41ecade9ea73ebb2173776c19b4898f4 Mon Sep 17 00:00:00 2001 From: datadog-bits <263423550+datadog-bits@users.noreply.github.com> Date: Mon, 10 Aug 2026 13:16:52 +0000 Subject: [PATCH 1/2] Document Bits Code conflict handling --- hugo/content/en/bits_ai/bits_code/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugo/content/en/bits_ai/bits_code/_index.md b/hugo/content/en/bits_ai/bits_code/_index.md index b84d570c166..3d7b4c94ac8 100644 --- a/hugo/content/en/bits_ai/bits_code/_index.md +++ b/hugo/content/en/bits_ai/bits_code/_index.md @@ -110,7 +110,7 @@ Bits Code also [ingests custom instructions][33] defined in your repository and Bits Code integrates with [source code providers](#supported-source-code-providers) to: - Create pull or merge requests, generating titles and descriptions based on your repository's pull or merge request template - Iterate on pull requests in response to comments (GitHub only); mention `@Datadog` in a comment to prompt Bits for updates -- Monitor CI logs and fix failures +- Monitor CI logs, fix failures, and attempt to resolve conflicts when a monitored GitHub pull request or GitLab merge request conflicts with its base branch. If conflicts and CI failures are both present, Bits Code can address them in the same run. Bits Code never auto-merges PRs or MRs. See all the PRs or MRs that Bits Code is working on in {{< ui >}}Bits AI{{< /ui >}} > {{< ui >}}Bits Code{{< /ui >}} > [{{< ui >}}Sessions{{< /ui >}}][7]. From 2390135f4eb6d9a82feb6dccd18daff45a85c7d1 Mon Sep 17 00:00:00 2001 From: datadog-bits <263423550+datadog-bits@users.noreply.github.com> Date: Mon, 10 Aug 2026 16:16:28 +0000 Subject: [PATCH 2/2] Shorten Bits Code collaboration bullet --- hugo/content/en/bits_ai/bits_code/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugo/content/en/bits_ai/bits_code/_index.md b/hugo/content/en/bits_ai/bits_code/_index.md index 3d7b4c94ac8..ce08feca80d 100644 --- a/hugo/content/en/bits_ai/bits_code/_index.md +++ b/hugo/content/en/bits_ai/bits_code/_index.md @@ -110,7 +110,7 @@ Bits Code also [ingests custom instructions][33] defined in your repository and Bits Code integrates with [source code providers](#supported-source-code-providers) to: - Create pull or merge requests, generating titles and descriptions based on your repository's pull or merge request template - Iterate on pull requests in response to comments (GitHub only); mention `@Datadog` in a comment to prompt Bits for updates -- Monitor CI logs, fix failures, and attempt to resolve conflicts when a monitored GitHub pull request or GitLab merge request conflicts with its base branch. If conflicts and CI failures are both present, Bits Code can address them in the same run. +- Monitor CI logs and pull or merge request state to fix failures and merge blockers Bits Code never auto-merges PRs or MRs. See all the PRs or MRs that Bits Code is working on in {{< ui >}}Bits AI{{< /ui >}} > {{< ui >}}Bits Code{{< /ui >}} > [{{< ui >}}Sessions{{< /ui >}}][7].