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

Revert "ENH Process modules one at a time" #27

Merged

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented May 7, 2024

This reverts commit 255e75a.

It turns out we actually fixed this bug twice, in two different ways. This was the more complex way so I've opted to revert it in favour of the simpler way.

The simpler way was done in #25. It was merged into the 1.1 branch but we didn't tag it for some reason. But I just used it and it works perfectly. I've tagged it now as 1.1.6.

There are merge conflicts now between 1.1 and 1. Those merge conflicts won't exist after this has been reverted, and then we can merge 1.1 with the simpler fix into 1 and call it a day.

This repo is being added to module-standardiser as part of silverstripe/.github#237 so merge-ups and other automated workflows will be added at that time.

Issue

@emteknetnz emteknetnz merged commit 714d3ab into silverstripe:1 May 7, 2024
1 check passed
@emteknetnz emteknetnz deleted the pulls/1/revert-second-fix branch May 7, 2024 03:11
@emteknetnz
Copy link
Member

@GuySartorelli Could you please do a merge-up to confirm things go as planned

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