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

Make macro configs static #1823

Closed
wants to merge 2 commits into from
Closed

Make macro configs static #1823

wants to merge 2 commits into from

Conversation

simonihmig
Copy link
Collaborator

Same as #1815, this time targeting main

@simonihmig simonihmig added the enhancement New feature or request label Feb 27, 2024
Copy link
Member

@mansona mansona left a comment

Choose a reason for hiding this comment

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

Shouldn't we just merge stable into main after we release stable and then the changes will come along? 🤔

@simonihmig
Copy link
Collaborator Author

yeah, I wasn't sure how we plan that!? I guess it depends how far the two branches diverged, and where the changes on stable happened? Changes in the macro package should be easy to merge, but not sure if we have others that cause crazy merge conflicts, or that we even don't want in main? More on you to decide I guess what makes more sense! :)

@mansona
Copy link
Member

mansona commented Feb 28, 2024

essentially we agreed collectively that we want to do this stuff as "forward merges" from stable to main, I'll give it a go and see how far I get :)

@mansona
Copy link
Member

mansona commented Feb 28, 2024

Didn't seem like too hard a merge 👍 #1825

@simonihmig
Copy link
Collaborator Author

Even better, closing this!

@simonihmig simonihmig closed this Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants