Conversation
Merge main into develop to update the develop branch to the latest version
There was a problem hiding this comment.
Pull Request Overview
This PR removes the auto-merge functionality from the develop-update workflow, requiring all PRs from main to develop to be manually reviewed and merged.
- Removed the
auto_mergeinput parameter from the workflow - Removed all auto-merge logic including hotfix detection, commenting, and warning steps
- Updated documentation to reflect that PRs are now created but not automatically merged
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| README.md | Updated documentation to remove references to the auto_merge input and described the new behavior where PRs are created but not automatically merged. However, outdated hotfix detection documentation remains. |
| .github/workflows/develop-update.yml | Removed the auto_merge input parameter and all related workflow steps (hotfix detection, auto-merge logic, commenting, and warnings) cleanly and completely. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
README.md
Outdated
| - **Hotfix detection**: When the latest commit on `main` was merged from a different branch (e.g., a hotfix), the workflow will: | ||
| - Skip auto-merge to allow manual review | ||
| - Create a PR from `main` to `develop` with the changes. | ||
| - Add a comment to the PR explaining the situation | ||
| - Create a workflow warning for visibility |
There was a problem hiding this comment.
The documentation still describes hotfix detection behavior (adding comments and creating workflow warnings) that has been removed from the workflow. Since the auto-merge functionality and all related hotfix detection logic have been removed, this section should be updated or removed to accurately reflect that the workflow now simply creates a PR from main to develop without any special hotfix handling.
1 participant
No description provided.