Skip to content

Conversation

@josephperrott
Copy link
Member

Change the merge method used by merge tooling to use rebase instead of using
squash.

Change the merge method used by merge tooling to use rebase instead of using
squash.
@josephperrott josephperrott added target: patch This PR is targeted for the next patch release action: merge The PR is ready for merge by the caretaker area: build & ci Related the build and CI infrastructure of the project labels Jan 11, 2021
@google-cla google-cla bot added the cla: yes label Jan 11, 2021
Copy link
Collaborator

@alan-agius4 alan-agius4 left a comment

Choose a reason for hiding this comment

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

Thanks for this @josephperrott

@alan-agius4 alan-agius4 merged commit ee0d782 into angular:master Jan 12, 2021
@josephperrott josephperrott deleted the merge-strategy-change branch January 12, 2021 13:58
@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 Feb 12, 2021
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: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants