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

chore: Merge prerelease/minor into prerelease/major #2945

Merged

Conversation

alanbsmith
Copy link
Member

This pull request was automatically created by an automated forward-merge job. The automated job failed automated checks and must be resolved manually.
Reasons for failure may include:

  • Merge conflicts that cannot be automatically resolved
  • A merge resulted in check failures
    • Lint or type errors
    • Test failures
    • Unexpected visual changes
      The pull request should inform you of merge conflicts before you start if any.
  1. Run the following commands in your terminal. If this succeeds, skip step 2. The last command will run a script that tries to merge and resolve conflicts automatically.
    git branch -D merge/prerelease/minor-into-prerelease/major || true
    git fetch upstream
    git checkout --track upstream/merge/prerelease/minor-into-prerelease/major
    git pull upstream merge/prerelease/minor-into-prerelease/major -f
    git pull upstream prerelease/minor
    node utils/forward-merge.js
    
  2. If the previous step succeeded, skip to step 4.
  3. Resolve conflicts manually. Then run the following.
    git add .
    git commit -m "chore: Merge prerelease/minor into prerelease/major"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/prerelease/minor-into-prerelease/major
    

If there were no merge conflicts, the forward-merge job failed because of a test failure. You can wait for the pull request to give errors, or you can check the logs for failures. You'll have to update code to fix errors.
This pull request will be merged using the merge strategy instead of the squash strategy. This means any commit in the log will show in the branch's history. Any commit you make should amend the merge commit. Use the following command:

git commit --amend --no-edit

You must then force-push the branch and the CI will rerun verification.
Use the automerge label like normal and the CI will pick the correct merge strategy.

josh-bagwell and others added 5 commits October 2, 2024 13:52
…2942)

Fixes: #2940  

Addresses issue for theming the buttons in the `Pagination` component.

[category:Components]

Release Note:
Fixes theming for the `BaseButton` within `Pagination`.
@alanbsmith alanbsmith enabled auto-merge October 3, 2024 15:14
@alanbsmith alanbsmith merged commit 1013004 into prerelease/major Oct 3, 2024
18 of 19 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch October 3, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

3 participants