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

PRO-613 FIX Merge in progress error #86

Merged
merged 1 commit into from
Nov 19, 2024

Conversation

orbitz
Copy link
Contributor

@orbitz orbitz commented Nov 19, 2024

Do not try to merge again or report as error if a merge is already in progress. This can happen by concurrent operations going on in a pull request (via environments).

Description

Type of change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update
  • Other (explain):

Checklist

  • I have read the contributing guidelines
  • The pull request title follows this format:
    ISSUE_NUMBER ACTION_TYPE Short description (e.g., 123 ADD Feature description)
  • I have added tests and documentation (if applicable)
  • My changes generate no new warnings/errors and do not break existing functionality

Additional context (optional)

Do not try to merge again or report as error if a merge is already in
progress.  This can happen by concurrent operations going on in a pull
request (via environments).
@orbitz orbitz requested a review from a team as a code owner November 19, 2024 08:24
@orbitz orbitz merged commit be279a4 into main Nov 19, 2024
4 checks passed
@orbitz orbitz deleted the pro-613-fix-merge-in-progress-error branch November 19, 2024 08:45
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