Skip to content

Remove main-to-dev inter-branch merge automation#7315

Merged
joperezr merged 2 commits intomainfrom
remove-dev-merge-flow
Feb 17, 2026
Merged

Remove main-to-dev inter-branch merge automation#7315
joperezr merged 2 commits intomainfrom
remove-dev-merge-flow

Conversation

@joperezr
Copy link
Member

@joperezr joperezr commented Feb 17, 2026

The dev branch has been deprecated and merged into main. This PR removes all remaining dev branch references:

  • .github/workflows/inter-branch-merge-flow.yml — the GitHub Action workflow that auto-created main→dev merge PRs
  • github-merge-flow.jsonc — the merge flow configuration
  • azure-pipelines-public.yml — removed \dev\ from trigger and PR branch includes
  • azure-pipelines.yml — removed \dev\ from trigger and PR branch includes

The dev branch has been deprecated and merged into main. The inter-branch
merge workflow and its configuration were still active, causing unnecessary
PRs to be created that had to be manually closed.

This removes:
- .github/workflows/inter-branch-merge-flow.yml (the GitHub Action)
- github-merge-flow.jsonc (the merge flow configuration)

Co-authored-by: Copilot <[email protected]>
@joperezr joperezr requested a review from a team as a code owner February 17, 2026 16:32
Copilot AI review requested due to automatic review settings February 17, 2026 16:32
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR removes deprecated automation for merging changes from the main branch to the dev branch. Since the dev branch has been merged into main and is no longer maintained, the inter-branch merge workflow was creating unnecessary PRs that had to be manually closed.

Changes:

  • Removed the GitHub Actions workflow file that automated inter-branch merging
  • Removed the merge flow configuration file that specified the main-to-dev merge rule

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
.github/workflows/inter-branch-merge-flow.yml Removed the GitHub Actions workflow that triggered automatic merge PRs
github-merge-flow.jsonc Removed the configuration specifying the main-to-dev merge flow

The dev branch is deprecated. Remove it from the trigger and PR branch
includes in both azure-pipelines-public.yml and azure-pipelines.yml.

Co-authored-by: Copilot <[email protected]>
@joperezr
Copy link
Member Author

FYI @stephentoub

@joperezr joperezr enabled auto-merge (squash) February 17, 2026 17:51
@joperezr joperezr merged commit c5d5480 into main Feb 17, 2026
6 checks passed
@joperezr joperezr deleted the remove-dev-merge-flow branch February 17, 2026 20:29
@github-actions github-actions bot locked and limited conversation to collaborators Mar 20, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants