Skip to content

Conversation

@alan-agius4
Copy link
Collaborator

This commit enables the 'auto' merge strategy for pull requests. This strategy automatically determines the best merge method based on the pull request's commits.

The auto merge strategy can:

  • Delegate to the autosquash merge strategy if the PR has fixup/squash commits against multiple normal commits.
  • Squash commits if the PR has only one normal commit and some fixup/squash commits.
  • Rebase commits if the PR has no fixup/squash commits.

This improves the developer experience by automating the merge process. A key benefit is that PRs that can be cleanly rebased will now appear as 'merged' in GitHub's UI, providing a clearer history than the previous 'unmerged' status that could occur with squashing.

@alan-agius4 alan-agius4 added the target: rc This PR is targeted for the next release-candidate label Oct 23, 2025
@angular-robot angular-robot bot added the area: build & ci Related the build and CI infrastructure of the project label Oct 23, 2025
@alan-agius4 alan-agius4 added the action: review The PR is still awaiting reviews from at least one requested reviewer label Oct 23, 2025
@alan-agius4 alan-agius4 added target: patch This PR is targeted for the next patch release target: rc This PR is targeted for the next release-candidate and removed target: rc This PR is targeted for the next release-candidate target: patch This PR is targeted for the next patch release labels Oct 23, 2025
This commit enables the 'auto' merge strategy for pull requests.
This strategy automatically determines the best merge method based on the
pull request's commits.

The auto merge strategy can:
- Delegate to the autosquash merge strategy if the PR has fixup/squash
  commits against multiple normal commits.
- Squash commits if the PR has only one normal commit and some
  fixup/squash commits.
- Rebase commits if the PR has no fixup/squash commits.

This improves the developer experience by automating the merge process. A
key benefit is that PRs that can be cleanly rebased will now appear as
'merged' in GitHub's UI, providing a clearer history than the previous
'unmerged' status that could occur with squashing.
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

LGTM

@alan-agius4 alan-agius4 added action: merge The PR is ready for merge by the caretaker and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Oct 23, 2025
@alan-agius4 alan-agius4 merged commit ffa7266 into angular:main Oct 23, 2025
32 checks passed
@alan-agius4 alan-agius4 deleted the pr-merge-auto branch October 23, 2025 16:15
@alan-agius4
Copy link
Collaborator Author

This PR was merged into the repository. The changes were merged into the following branches:

@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Nov 23, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker area: build & ci Related the build and CI infrastructure of the project target: rc This PR is targeted for the next release-candidate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants