Skip to content

Enable merge queue in github to avoid commit confliction. #6880

Closed
#21941
Closed
Enable merge queue in github to avoid commit confliction.#6880
#21941
Assignees
blaginin
Labels
development-processRelated to development process of DataFusionenhancementNew feature or request

Description

@liurenjie1024
liurenjie1024
opened on Jul 7, 2023

Describe the bug

See #6875 for details. We can enable merge queue to avoid such kind of conflicts. You can find out details here:
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

To Reproduce

No response

Expected behavior

No response

Additional context

No response

Activity

  1. liurenjie1024
    added
    bugSomething isn't working
    on Jul 7, 2023
  2. alamb
    added
    enhancementNew feature or request
    development-processRelated to development process of DataFusion
    and removed
    bugSomething isn't working
    on Jul 10, 2023

  3. alamb commented on Jul 10, 2023

    @alamb
    alamb
    on Jul 10, 2023
    Contributor

    This would be awesome to do -- thank you for the suggestion @liurenjie1024

    The repository settings are controlled by https://github.com/apache/arrow-datafusion/blob/main/.asf.yaml

    Perhaps someone can research how to change that file to enable the merge queue

  4. alamb
    added
    good first issueGood for newcomers
    on Jul 10, 2023

  5. liurenjie1024 commented on Jul 10, 2023

    @liurenjie1024
    liurenjie1024
    on Jul 10, 2023
    ContributorAuthor

    Cool, let me have a try.

  6. liurenjie1024 commented on Jul 12, 2023

    @liurenjie1024
    liurenjie1024
    on Jul 12, 2023
    ContributorAuthor

    Oh, it seems that only apache committers can view the infra page: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features and I can't help much. Anyway, merge queue is a great way to reduce merge conflicts and it would be helpful to enable that.

  7. alamb commented on Jul 12, 2023

    @alamb
    alamb
    on Jul 12, 2023
    Contributor

    Here is the page: INFRA-Git-.asf.yamlfeatures-120723-1012-2450.pdf

  8. liurenjie1024 commented on Jul 12, 2023

    @liurenjie1024
    liurenjie1024
    on Jul 12, 2023
    ContributorAuthor

    Seems that merge queue is not supported by apache git infra 😂, let's close this first.

  9. liurenjie1024
    closed this as completedon Jul 12, 2023

  10. alamb commented on Jul 12, 2023

    @alamb
    alamb
    on Jul 12, 2023
    Contributor

    😢

  11. crepererum commented on Jan 18, 2024

    @crepererum
    crepererum
    on Jan 18, 2024
    Contributor

    I propose we re-open this since this is clearly a feature that we want, it's just blocked by ASF at the moment.

  12. alamb
    reopened this on Jan 18, 2024
  13. alamb
    removed
    good first issueGood for newcomers
    on Jul 15, 2024

  14. 21 remaining items

  15. alamb commented on Sep 17, 2025

    @alamb
    alamb
    on Sep 17, 2025
    Contributor

    I'm not sure I have permissions to create that, do you?

    Yes, I think the PMC chair needs to request it. I will do so.

    I think it would be better if it is public with a clear README

  16. alamb commented on Sep 17, 2025

    @alamb
    alamb
    on Sep 17, 2025
    Contributor

    https://github.com/apache/datafusion-sandbox is now available

  17. blaginin commented on Sep 17, 2025

    @blaginin
    blaginin
    on Sep 17, 2025
    Member

    Thank you! My plan is to fork the main project there, but instead of readme put a big warning that you should never use this project, this is our CI sandbox

  18. blaginin commented on Oct 3, 2025

    @blaginin
    blaginin
    on Oct 3, 2025
    Member

    Status: we're working on letting maintainers bypass branch protection rules if required steps fail (so cases like #17629 don't block us). Github support suggested some good ideas, and we're waiting for infra to set up a new permission group 🙏

  19. findepi commented on Oct 5, 2025

    @findepi
    findepi
    on Oct 5, 2025
    Member

    How can I know what build jobs were performed by the merge queue?

    I am intrigued by this:

    Image

  20. alamb commented on Oct 6, 2025

    @alamb
    alamb
    on Oct 6, 2025
    Contributor

    yet, it was merged within a minute. I expected a full CI build to be performed by the merge queue, but I think it takes more time than that

    The idea is eventually to get to the point where the full CI build is performed as part of the Merge Queue

    However, we hit a problem with this (which effectively locked us out from being able to merge PRs)

    Ae are now in the process of trying to ensure we can bypass the checks when there is some need, but otherwise the checks will run as expected

  21. findepi commented on Oct 6, 2025

    @findepi
    findepi
    on Oct 6, 2025
    Member

    Thanks for explaining! I noticed some references to a problem, but wasn't aware what the workaround actually entails.

  22. blaginin commented on Oct 21, 2025

    @blaginin
    blaginin
    on Oct 21, 2025
    Member

    Status report for transparency: waiting for the infra team to enable the new setting

  23. Jefffrey commented on Nov 15, 2025

    @Jefffrey
    Jefffrey
    on Nov 15, 2025
    Contributor

    I noticed that Merge when ready only waits for approvals instead of the actual CI checks to pass; is this something we are aware of/is expected?

  24. blaginin commented on Nov 15, 2025

    @blaginin
    blaginin
    on Nov 15, 2025
    Member

    Correct, waiting for this Pr to merge: apache/infrastructure-actions#312 (comment)

  25. github-merge-queue
    added a commit that references this issue on Apr 2, 2026

    Merge queue: make dev checks required + add .asf.yaml validation (#21239

    18af518
  26. zhuqi-lucas
    added a commit that references this issue on Apr 4, 2026

    Merge queue: make dev checks required + add .asf.yaml validation (apa…

    d5377dc
  27. Rich-T-kid
    added a commit that references this issue on Apr 21, 2026

    Merge queue: make dev checks required + add .asf.yaml validation (apa…

    b091245
  28. comphead
    closed this as completedin #21941on May 6, 2026
  29. pull
    added a commit that references this issue on May 6, 2026

    chore: Rust checks are required + merge queue (apache#21941)

    5c097fd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

development-processRelated to development process of DataFusionenhancementNew feature or request

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions