TinyDB Materials

[eyrei123]

Where to put new files:

• New files should go into a top-level subfolder, named after the article slug. For example: my-awesome-article

How to merge your changes:

1. Make sure the CI code style tests all pass (+ run the automatic code formatter if necessary).
2. Find an RP Team member on Slack and ask them to review & approve your PR.
3. Once the PR has one positive ("approved") review, GitHub lets you merge the PR.
4. 🎉

[martin-martin]

Looks good to me : )

[martin-martin]

@eyrei123 looks like something went quite muddled here after your force push. Please avoid doing that in the future. I had to hop around a bunch of corners to understand what happened and then get it fixed. Please always fetch from the remote first before pushing updates.

It looks like what happened in this situation is that merged from master into your branch (which we do sometimes to update the branch). Then, you didn't fetch before trying to update, ran into an issue based on that, and then did a force push. That showed changes (deletions) to a bunch of files from master that showed up in the files changed tab. There were 23 files instead of the 9 that are related to your PR, and I had to dig through some Git weirdness to get those deleted files back into the history proper, so that we can merge this PR without deleting files on master.

The force push also reset changes that I did to the README file earlier, which stayed around as a merge conflict artifact even in the final commit that you submitted.

The short takeaways:

1. Pull your branch before pushing
2. Don't force push

Thanks you!

[martin-martin]

Note to myself (or final QA person): Please use Squash and merge option when merging this PR 🙏