Skip to content

fix(mergify): use rebase method for auto-update to avoid extra merge commits #1069

@LalatenduMohanty

Description

@LalatenduMohanty

Problem

The "Auto-update approved PRs that are behind" rule is creating merge commits (Merge branch 'main' into <branch>) instead of rebasing. This pollutes PR history with spurious commits from mergify[bot].

Examples:

Root Cause

The update: action in .mergify.yml has no method specified, which defaults to merge.

Expected behavior:

If a rebase fails (e.g., conflicts), the update will fail cleanly rather than falling back to merge.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions