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

Flatten for enums #334

Merged
merged 20 commits into from Jan 18, 2020
Merged

Flatten for enums #334

merged 20 commits into from Jan 18, 2020

Conversation

CreepySkeleton
Copy link
Collaborator

Resolving merge conflicts in #329

@cecton, your authorship is preserved, sorry again for the mess.

@CreepySkeleton CreepySkeleton merged commit c9f9087 into master Jan 18, 2020
@CreepySkeleton CreepySkeleton deleted the flatten-for-enums branch January 18, 2020 20:51
@cecton
Copy link
Contributor

cecton commented Jan 19, 2020

No problem, I really don't mind either way. But now you have a lot of WIP in your master branch. I would have squash-merged that if I were you. Do you plan to do a release?

@CreepySkeleton
Copy link
Collaborator Author

They are behind a merge commit, who cares about them? The release is coming soon.

@TeXitoi
Copy link
Owner

TeXitoi commented Jan 19, 2020

I prefer to squash in this case but that's not really important.

@CreepySkeleton
Copy link
Collaborator Author

0.3.8 published

@cecton
Copy link
Contributor

cecton commented Jan 19, 2020

They are behind a merge commit, who cares about them? The release is coming soon.

It looks pretty horrible in the git logs and I feel ashamed 😭

😂 but thanks! I learned a lot and you have been incredibly helpful

@CreepySkeleton
Copy link
Collaborator Author

@cecton Thanks for contributing!

It's both nice and horrifying to hear that someone has managed to learn from this pile of garbage we call codebase...

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.

None yet

3 participants