Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(platform/azure): replace squashMerge by mergeStrategy #26436

Merged
merged 1 commit into from Dec 27, 2023

Conversation

joegoldman2
Copy link
Contributor

Changes

This PR replaces the usage of squashMerge by mergeStrategy. Indeed, squashMerge has been deprecated by Microsoft and we need to make sure that mergeStrategy is properly set instead: https://learn.microsoft.com/en-us/rest/api/azure/devops/git/pull-requests/update?view=azure-devops-rest-7.1#gitpullrequestcompletionoptions

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@viceice viceice added this pull request to the merge queue Dec 27, 2023
Merged via the queue into renovatebot:main with commit 4345212 Dec 27, 2023
36 checks passed
@joegoldman2 joegoldman2 deleted the test/squash-merge-deprecated branch December 27, 2023 13:01
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.108.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 22, 2024
zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 24, 2024
zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 24, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants