Skip to content

chore: updated auto merge workflow #1803

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

Merged
merged 1 commit into from
May 20, 2025

Conversation

Rafi-Microsoft
Copy link
Contributor

Purpose

  • Enhanced rebase logic to handle merge conflicts using --strategy-option=theirs.

  • Implemented multi-strategy auto-merge (merge, squash, rebase) with fallback handling.

  • Improved overall script reliability and compatibility with repo-level merge restrictions.

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

@Rafi-Microsoft Rafi-Microsoft added this pull request to the merge queue May 20, 2025
Merged via the queue into main with commit d00b805 May 20, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants