Skip to content

🔧 update repository.datadog.yml integration branch config#4390

Merged
thomas-lebeau merged 1 commit intomainfrom
thomas.lebeau/update-repository-datadog-yml
Mar 25, 2026
Merged

🔧 update repository.datadog.yml integration branch config#4390
thomas-lebeau merged 1 commit intomainfrom
thomas.lebeau/update-repository-datadog-yml

Conversation

@thomas-lebeau
Copy link
Copy Markdown
Collaborator

@thomas-lebeau thomas-lebeau commented Mar 25, 2026

Motivation

The v7 integration branch is a long-lived branch. However, recently devflow has enabled ephemeral branches which we does not match with our workflow. (see: https://dd.slack.com/archives/C045N8L63PE/p1774439487934519)

Changes

  • Add ephemeral: false to the v7 integration branch definition
  • Add hide_reset_branch_instructions_on_conflict: true to suppress misleading/dangerous reset instructions on conflict. this is unrelated, but it's a nice to have

Test instructions

Configuration-only change — no code to run. Verify via the Datadog repository tooling that:

  1. v7 is not treated as an ephemeral branch
  2. On merge conflict, no reset instructions are shown

Checklist

  • Tested locally
  • Tested on staging
  • Added unit tests for this change.
  • Added e2e/integration tests for this change.
  • Updated documentation and/or relevant AGENTS.md file

Add ephemeral and hide_reset_branch_instructions_on_conflict fields
to the v7 integration branch definition.
@thomas-lebeau thomas-lebeau marked this pull request as ready for review March 25, 2026 13:16
@thomas-lebeau thomas-lebeau requested a review from a team as a code owner March 25, 2026 13:16
@thomas-lebeau thomas-lebeau merged commit 1d7c851 into main Mar 25, 2026
22 checks passed
@thomas-lebeau thomas-lebeau deleted the thomas.lebeau/update-repository-datadog-yml branch March 25, 2026 14:32
@github-actions github-actions bot locked and limited conversation to collaborators Mar 25, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants