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

Merge beta + main conflict resolutions into beta #122

Merged
merged 11 commits into from
Sep 30, 2024

Conversation

DukeFerdinand
Copy link
Contributor

@DukeFerdinand DukeFerdinand commented Aug 19, 2024

Alaska Airlines Pull Request

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Resolves: #115

Summary:

Beta and main have slightly diverged since opening the beta branch. This PR intends to resolve those for a simple merge into main once we're ready to ship the theme beta :)

Type of change:

Please delete options that are not relevant.

  • Other (please elaborate)

Checklist:

  • My update follows the CONTRIBUTING guidelines of this project
  • I have performed a self-review of my own update

By submitting this Pull Request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Pull Requests will be evaluated by their quality of update and whether it is consistent with the goals and values of this project. Any submission is to be considered a conversation between the submitter and the maintainers of this project and may require changes to your submission.

Thank you for your submission!

-- Auro Design System Team

Summary by Sourcery

Merge changes from the main branch into the beta branch, resolving conflicts and updating documentation formatting. Revert a previous feature related to theme support in the CHANGELOG.

Documentation:

  • Resolve minor formatting issues in the README.md file to improve readability and consistency.

Chores:

  • Update CHANGELOG.md to reflect the latest changes, including a reversion of a previous feature related to theme support.

@CLAassistant
Copy link

CLAassistant commented Aug 19, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ DukeFerdinand
✅ jason-capsule42
✅ jordanjones243
❌ semantic-release-bot
You have signed the CLA already but the status is still pending? Let us recheck it.

@DukeFerdinand DukeFerdinand force-pushed the dhook/beta-merge-conflict-resolution branch from 323c5db to c8de0bf Compare August 19, 2024 21:37
This repo was/is having the same problem as the auro-flight repo where rollup fails to run on linux x64.

This should fix the build as the same change worked on auro-flight.
@DukeFerdinand DukeFerdinand marked this pull request as ready for review August 19, 2024 22:19
@DukeFerdinand DukeFerdinand requested a review from a team as a code owner August 19, 2024 22:19
Copy link

sourcery-ai bot commented Aug 19, 2024

Reviewer's Guide by Sourcery

This pull request resolves conflicts between the beta and main branches of the Alaska Airlines Accordion component. The changes primarily involve minor updates to the README.md file and the CHANGELOG.md file. The main changes include:

  1. Small formatting adjustments in the README.md file.
  2. Updates to the version numbers in the installation instructions.
  3. Changes to the CHANGELOG.md file, including the addition of a new version (3.2.1) and a revert of a previous feature.

The changes appear to be mostly housekeeping in nature, preparing the beta branch for merging into the main branch.

File-Level Changes

Files Changes
README.md Updated version numbers in installation instructions
README.md Made minor formatting adjustments throughout the file
CHANGELOG.md Added new version 3.2.1 to the changelog
CHANGELOG.md Reverted a previous feature related to theme support
CHANGELOG.md Updated version information for version 3.2.0

Tips
  • Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
  • Continue your discussion with Sourcery by replying directly to review comments.
  • You can change your review settings at any time by accessing your dashboard:
    • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
    • Change the review language;
  • You can always contact us if you have any questions or feedback.

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @DukeFerdinand - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.

@DukeFerdinand DukeFerdinand added the Status: Review Needed Work is completed, user is requesting feedback label Aug 19, 2024
@DukeFerdinand DukeFerdinand linked an issue Aug 20, 2024 that may be closed by this pull request
package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
@jordanjones243 jordanjones243 merged commit efc4427 into beta Sep 30, 2024
3 of 4 checks passed
@jordanjones243 jordanjones243 deleted the dhook/beta-merge-conflict-resolution branch September 30, 2024 21:37
@blackfalcon
Copy link
Member

🎉 This PR is included in version 4.0.0-beta.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@jason-capsule42 jason-capsule42 restored the dhook/beta-merge-conflict-resolution branch September 30, 2024 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Review Needed Work is completed, user is requesting feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Theme Support
6 participants