search

open-sauced / pizza-verse

A repository for all things pizza.
MIT License
38 stars 55 forks source link

feat: Add a pizza fact #91

Closed prw760 closed 3 months ago

prw760 commented 3 months ago

Description

This PR adds a pizza fact

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

Related Tickets & Documents

Related to #36

Added to documentation?

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

adiati98 commented 3 months ago

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

Thank you! 🙂

prw760 commented 3 months ago

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.

adiati98 commented 3 months ago

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 commented 3 months ago

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