pizza-verse icon indicating copy to clipboard operation
pizza-verse copied to clipboard

feat: Add a pizza fact

Open prw760 opened this issue 9 months ago β€’ 1 comments

Description

This PR adds a pizza fact

What type of PR is this? (check all applicable)

  • [ X] ☝️ Add a pizza fact or trivia
  • [ ] πŸ§‘β€πŸ³ Add a pizza recipe
  • [ ] πŸ—ΊοΈ Add a regional pizza
  • [ ] 🍴 Add a traditional food
  • [ ] πŸ“ Documentation Update

Related Tickets & Documents

Related to #36

Added to documentation?

  • [ ] πŸ“œ README.md
  • [ X] πŸ™… no documentation needed

[optional] What GIF best describes this PR or how it makes you feel?

prw760 avatar May 13 '24 19:05 prw760

@prw760 we've merged a PR before yours. So, please resolve the merge conflicts before we review your PR.

Thank you! πŸ™‚

adiati98 avatar May 14 '24 11:05 adiati98

Hi, Ayu. I accepted your changes, but I cannot click the resolve conflicts area because I don't have write access to the main repo. Do I have an actionable still -- or am I waiting for the repo managers? Thanks again for your patience while I'm learning.

prw760 avatar May 17 '24 00:05 prw760

Hey @prw760,

Answering your question, whenever you see merge conflicts in you PR, you need to resolve them yourself. Most of the time, maintainers won't do this for you because they don't have the resources to do so.

I've actually gave you the link to resolve conflicts in my previous comment, but I'm dropping it here again.

I wrote a blog post as well about resolving merge conflicts if you'd like to learn further. πŸ™‚

adiati98 avatar May 17 '24 06:05 adiati98

If you haven't deleted your local branch, I encourage you to try resolving the merge conflicts to practice. 😊

adiati98 avatar May 17 '24 08:05 adiati98