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 "v0.3.3 changes into main" #79

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Conversation

davidhopkinson26
Copy link
Contributor

@davidhopkinson26 davidhopkinson26 commented Mar 15, 2023

Reverts #64

correcting for a squashed commit from develop. #64 was squashed which has resulted in commits reappearing in #78. Best way to preserve work appears to be to revert #64 and then re-apply changes in #78.

@davidhopkinson26
Copy link
Contributor Author

davidhopkinson26 commented Mar 15, 2023

failing linting checks due to reverting bugfix from #45. #78 should bring this change back into main and it is only linting so we should be safe to override the checks in this case

@adamsardar
Copy link
Contributor

adamsardar commented Mar 21, 2023

I agree that, whilst it isn't ideal to override the linter, commit history train wrecks can make for an unfortunate tangle. You're right that it's picking up on the issue solved here in #45. Agree that we can await #78 for restoration of lints (currently passing).

@adamsardar
Copy link
Contributor

Practically impossible to review the squashed commits here as the individual commits have been lost. We should disable the ability to 'squash and merge' is possible; I don't see why you would do this at the stage of merge.

See: https://dev.to/wesen/squash-commits-considered-harmful-ob1

@davidhopkinson26 davidhopkinson26 merged commit fee9828 into main Mar 21, 2023
@davidhopkinson26 davidhopkinson26 deleted the revert-64-develop branch March 21, 2023 14:37
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