Skip to content

Add draft PR guidance to AGENTS.md#260536

Merged
lukeelmers merged 2 commits into
elastic:mainfrom
lukeelmers:update-agents
Mar 31, 2026
Merged

Add draft PR guidance to AGENTS.md#260536
lukeelmers merged 2 commits into
elastic:mainfrom
lukeelmers:update-agents

Conversation

@lukeelmers
Copy link
Copy Markdown
Contributor

@lukeelmers lukeelmers commented Mar 31, 2026

Summary

  • Instruct agents to use git merge origin/main (not rebase/reset) to update branches will discuss this elsewhere
  • Require agent-opened PRs to be drafts by default

@lukeelmers lukeelmers marked this pull request as ready for review March 31, 2026 16:34
@lukeelmers lukeelmers requested a review from a team as a code owner March 31, 2026 16:34
@lukeelmers lukeelmers self-assigned this Mar 31, 2026
@lukeelmers lukeelmers added skip-ci backport:all-open Backport to all branches that could still receive a release release_note:skip Skip the PR/issue when compiling release notes labels Mar 31, 2026
@lukeelmers lukeelmers enabled auto-merge (squash) March 31, 2026 16:39
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

cc @lukeelmers

Comment thread AGENTS.md Outdated
- Make focused changes; avoid unrelated refactors.
- Update docs and tests when behavior or usage changes.
- Never remove, skip, or comment out tests to make them pass; fix the underlying code.
- Update your branch from `main` with `git merge origin/main` (after fetching). Do not rebase or reset against `main`.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always fetch upstream and merge from main with git merge upstream/main. Is this not what others do?

Copy link
Copy Markdown
Contributor

@kapral18 kapral18 Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I use rebase exclusively. For long running PRs you can accumulates hundreds of commits in between your local commits and if you want to cleanup history before presenting to the reviewers it's no a pleasant experience. The "reset against main" is definitely gonna fight with that.

Comment thread AGENTS.md Outdated
@lukeelmers lukeelmers disabled auto-merge March 31, 2026 19:09
@lukeelmers lukeelmers changed the title Add git merge and draft PR guidance to AGENTS.md Add draft PR guidance to AGENTS.md Mar 31, 2026
@lukeelmers lukeelmers enabled auto-merge (squash) March 31, 2026 19:10
@lukeelmers lukeelmers merged commit d776f8a into elastic:main Mar 31, 2026
15 checks passed
@lukeelmers lukeelmers deleted the update-agents branch March 31, 2026 19:55
@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.19, 9.2, 9.3

https://github.com/elastic/kibana/actions/runs/23816632913

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 31, 2026
Require agent-opened PRs to be drafts by default

(cherry picked from commit d776f8a)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 31, 2026
Require agent-opened PRs to be drafts by default

(cherry picked from commit d776f8a)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 31, 2026
Require agent-opened PRs to be drafts by default

(cherry picked from commit d776f8a)
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 All backports created successfully

Status Branch Result
8.19
9.2
9.3

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Mar 31, 2026
# Backport

This will backport the following commits from `main` to `9.2`:
- [Add draft PR guidance to AGENTS.md
(#260536)](#260536)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Luke
Elmers","email":"luke.elmers@elastic.co"},"sourceCommit":{"committedDate":"2026-03-31T19:55:34Z","message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","skip-ci","backport:all-open","v9.4.0"],"title":"Add
draft PR guidance to
AGENTS.md","number":260536,"url":"https://github.com/elastic/kibana/pull/260536","mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/260536","number":260536,"mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}}]}]
BACKPORT-->

Co-authored-by: Luke Elmers <luke.elmers@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 31, 2026
# Backport

This will backport the following commits from `main` to `9.3`:
- [Add draft PR guidance to AGENTS.md
(#260536)](#260536)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Luke
Elmers","email":"luke.elmers@elastic.co"},"sourceCommit":{"committedDate":"2026-03-31T19:55:34Z","message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","skip-ci","backport:all-open","v9.4.0"],"title":"Add
draft PR guidance to
AGENTS.md","number":260536,"url":"https://github.com/elastic/kibana/pull/260536","mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/260536","number":260536,"mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}}]}]
BACKPORT-->

Co-authored-by: Luke Elmers <luke.elmers@elastic.co>
delanni pushed a commit that referenced this pull request Apr 1, 2026
# Backport

This will backport the following commits from `main` to `8.19`:
- [Add draft PR guidance to AGENTS.md
(#260536)](#260536)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Luke
Elmers","email":"luke.elmers@elastic.co"},"sourceCommit":{"committedDate":"2026-03-31T19:55:34Z","message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","skip-ci","backport:all-open","v9.4.0"],"title":"Add
draft PR guidance to
AGENTS.md","number":260536,"url":"https://github.com/elastic/kibana/pull/260536","mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/260536","number":260536,"mergeCommit":{"message":"Add
draft PR guidance to AGENTS.md (#260536)\n\nRequire agent-opened PRs to
be drafts by
default","sha":"d776f8ac8384caf11c368fc67bb1493bff349e8a"}}]}]
BACKPORT-->

Co-authored-by: Luke Elmers <luke.elmers@elastic.co>
jeramysoucy pushed a commit to jeramysoucy/kibana that referenced this pull request Apr 1, 2026
Require agent-opened PRs to be drafts by default
paulinashakirova pushed a commit to paulinashakirova/kibana that referenced this pull request Apr 2, 2026
Require agent-opened PRs to be drafts by default
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:all-open Backport to all branches that could still receive a release release_note:skip Skip the PR/issue when compiling release notes skip-ci v8.19.14 v9.2.8 v9.3.3 v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants