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

Don't merge open PRs in dev by default. #2633

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Conversation

ideadude
Copy link
Member

We're not sure why we would want to merge open PRs in the dev branch AFTER pushing a release. This commit disables that by setting the default for the 'merge' option to ''.

This didn't seem to be an issue in the past because failing tests and branch protection rules would stop any PRs from merging anyway.

Checklist:

  • This PR requires and contains at least one changelog file.
  • My code has been tested.
  • My code passes all existing automated tests.
  • My code follows the LifterLMS Coding & Documentation Standards.

We're not sure why we would want to merge open PRs in the dev branch AFTER pushing a release. This commit disables that by setting the default for the 'merge' option to ''.

This didn't seem to be an issue in the past because failing tests and branch protection rules would stop any PRs from merging anyway.
@ideadude ideadude changed the base branch from trunk to dev April 18, 2024 15:23
Copy link
Contributor

github-actions bot commented Apr 18, 2024

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements 77.18% 328/425
🟡 Branches 68.45% 141/206
🟢 Functions 82.93% 68/82
🟡 Lines 76.68% 319/416

Test suite run success

169 tests passing in 22 suites.

Report generated by 🧪jest coverage report action from ef21d6c

@brianhogg brianhogg merged commit 0c85406 into dev Apr 18, 2024
35 checks passed
@brianhogg brianhogg deleted the fix/create-js-merge-default branch April 18, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants