Skip to content

Require linear history in lang-team repo#2538

Draft
tmandry wants to merge 1 commit into
rust-lang:mainfrom
tmandry:patch-17
Draft

Require linear history in lang-team repo#2538
tmandry wants to merge 1 commit into
rust-lang:mainfrom
tmandry:patch-17

Conversation

@tmandry

@tmandry tmandry commented Jun 29, 2026

Copy link
Copy Markdown
Member

We don't use bors, so all three options to merge a pull request appear. Historically PRs have used merge commits, but this was not enforced.

There's not a need for merge commits in a repo as simple as lang-team, and there's not an option to require them for consistency either. For simplicity, let's disallow future merge commits and keep a linear history.

@github-actions

Copy link
Copy Markdown
Dry-run check results

[WARN  rust_team::sync] sync-team is running in dry mode, no changes will be applied.
[INFO  rust_team::sync] synchronizing crates-io
[INFO  rust_team::sync] synchronizing github
[INFO  rust_team::sync] 💻 Repo Diffs:
    📝 Editing repo 'rust-lang/lang-team':
      Rulesets:
          Creating 'main'
            Include Branches: ["refs/heads/main"]
            Require linear history: true
            Required approvals: 1

@rustbot

rustbot commented Jul 3, 2026

Copy link
Copy Markdown

☔ The latest upstream changes (possibly #2550) made this pull request unmergeable. Please resolve the merge conflicts.

@jieyouxu jieyouxu added needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-review Status: waiting on review from a team/WG/PG lead, an infra-admin, and/or a team-repo-admin. labels Jul 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-review Status: waiting on review from a team/WG/PG lead, an infra-admin, and/or a team-repo-admin.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants