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

fix(github): try push branch if rebase fails #22376

Merged
merged 2 commits into from May 25, 2023

Conversation

rarkins
Copy link
Collaborator

@rarkins rarkins commented May 23, 2023

Changes

Catches and retries a branch rebase when it seems the branch does not exist.

Context

Closes #22366

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

@rarkins rarkins enabled auto-merge May 23, 2023 15:16
@rarkins rarkins requested a review from secustor May 23, 2023 15:16
@rarkins rarkins disabled auto-merge May 25, 2023 13:15
@rarkins rarkins merged commit 3cc637f into main May 25, 2023
11 checks passed
@rarkins rarkins deleted the fix/22366-retry-github-rebase branch May 25, 2023 13:15
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 35.101.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 25, 2023
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

4 participants