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

Corrected PR: added the PR checklist #91

Merged
merged 5 commits into from
Sep 30, 2024

Conversation

kierisi
Copy link
Contributor

@kierisi kierisi commented Sep 19, 2024

this PR corrects the merge conflicts in #90

the goal of this PR is to add a short checklist for users to follow when submitting a PR to pyOpenSci.

@kierisi
Copy link
Contributor Author

kierisi commented Sep 19, 2024

pre-commit.ci autofix

@kierisi
Copy link
Contributor Author

kierisi commented Sep 19, 2024

@lwasser this is ready for review, and should resolve the merge conflicts from #90, which I've closed with comment. I figured out what happened, and the fix was pretty straightforward. I had ended up committing the content from this PR on the wrong branch 🙃

I've checked this PR for the correct files, and the local build looks good on my end as it incorporates this new information, but doesn't make any changes to the canva pages.

@lwasser
Copy link
Member

lwasser commented Sep 19, 2024

awesome. thanks @kierisi i'll give this a review today!

@lwasser
Copy link
Member

lwasser commented Sep 30, 2024

pre-commit.ci autofix

@lwasser lwasser merged commit 40118e0 into pyOpenSci:main Sep 30, 2024
3 checks passed
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