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

Upgrade Winston from 2.x to 3.x #1

Merged
merged 1 commit into from
Aug 23, 2021
Merged

Upgrade Winston from 2.x to 3.x #1

merged 1 commit into from
Aug 23, 2021

Conversation

bausmeier
Copy link

I've opened an upstream PR (jembi#195), but also opening one here so that we don't have to wait for a response.

@trevorgowing trevorgowing merged commit 2d1a723 into master Aug 23, 2021
@bausmeier
Copy link
Author

@trevorgowing FYI, I think that rebasing was the wrong choice here. The history is now guaranteed to diverge from the Jembi repo. A fast-forward merge would have been a better choice since it would have kept the exact same commit hash, which would then match the commit that gets merged into the Jembi repo. We'll just have to force push and overwrite this repo's master branch with the upstream one if/when that PR gets merged.

@trevorgowing
Copy link
Member

@bausmeier Noted. My bad. I didn't even think about it.

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