Skip to content

Revert "Sequelize package json fix"#27

Closed
minademian wants to merge 1 commit intoproductionfrom
revert-16-sequelize-package-json-fix
Closed

Revert "Sequelize package json fix"#27
minademian wants to merge 1 commit intoproductionfrom
revert-16-sequelize-package-json-fix

Conversation

@minademian
Copy link
Copy Markdown
Contributor

Reverts #16

@joshuasorkin
Copy link
Copy Markdown
Owner

Tbh I'm getting a little confused as to what should be done here (revert #16? merge #25? don't revert?) Much as I would love to push ahead on construction, I'm going to hold off for the moment, and we can make a well-informed decision on our call tomorrow.

@minademian
Copy link
Copy Markdown
Contributor Author

GitHub will take care of it all. A revert commit just removes a previously merged PR and commits it to git history. If you approve and merge, you're all set.

@joshuasorkin
Copy link
Copy Markdown
Owner

ok then I think I'll merge this one and then we can disregard #25 since it's mostly redundant with this one

@minademian
Copy link
Copy Markdown
Contributor Author

minademian commented Oct 12, 2022 via email

@joshuasorkin
Copy link
Copy Markdown
Owner

....oh wait i'm confused. if I confirm merge on this one, am i confirming the revert, or am I committing #16?

@minademian
Copy link
Copy Markdown
Contributor Author

If you confirm merge on this one, you're confirming the revert which is essentially rolling back from merging #16.

@joshuasorkin
Copy link
Copy Markdown
Owner

ok so if I do nothing with this one, the changes from #16 will stay? That's what I want, assuming you're ok with #16 not being a tagged PR.

@minademian
Copy link
Copy Markdown
Contributor Author

minademian commented Oct 12, 2022 via email

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