Plusplusminusminus/20260529 add pizza lore#443
Conversation
|
there are some merge conflicts, watch the video below on how to resolve them |
epicgdog
left a comment
epicgdog
left a comment
There was a problem hiding this comment.
Please don't plagiarize.
| <!DOCTYPE html> | ||
| <html> | ||
|
|
||
| <head> | ||
| <title>Pizza</title> | ||
| </head> | ||
|
|
||
| <body> | ||
| <a href="../index.html">home</a> | ||
| <h1>Pizza</h1> | ||
| <h2>Ingredients</h2> | ||
| <ul> | ||
| <li>2 cups all-purpose flour</li> | ||
| <li>1 packet (2¼ tsp) active dry yeast</li> | ||
| <li>¾ cup warm water</li> | ||
| <li>1 tbsp olive oil</li> | ||
| <li>1 tsp sugar</li> | ||
| <li>1½ tsp salt</li> | ||
| <li>½ cup pizza sauce</li> | ||
| <li>1½ cups shredded mozzarella cheese</li> |
There was a problem hiding this comment.
I saw your earlier commit was already merged. That means your recipe has been uploaded and you don't need to have your recipe here again. Only add the lore and the critic section.
There was a problem hiding this comment.
Done. I cleaned up the branch so the PR only contains the lore and critic section.
There was a problem hiding this comment.
Not quite. Your diff should not include the recipe if you are solely adding the critic review. This diff still has the entire recipe on it.
Take a look at this PR that was closed for reference, this is what it should look like: https://github.com/SCE-Development/git-workshop/pull/426/changes
plusplusminusminus
force-pushed
the
plusplusminusminus/20260529_add_pizza_lore
branch
from
1ef52e3 to
ffd01c2
Compare
epicgdog
left a comment
epicgdog
left a comment
There was a problem hiding this comment.
One other thing as well to notice is that there are merge conflicts. Please look at the video on how to solve this:
| <!DOCTYPE html> | ||
| <html> | ||
|
|
||
| <head> | ||
| <title>Pizza</title> | ||
| </head> | ||
|
|
||
| <body> | ||
| <a href="../index.html">home</a> | ||
| <h1>Pizza</h1> | ||
| <h2>Ingredients</h2> | ||
| <ul> | ||
| <li>2 cups all-purpose flour</li> | ||
| <li>1 packet (2¼ tsp) active dry yeast</li> | ||
| <li>¾ cup warm water</li> | ||
| <li>1 tbsp olive oil</li> | ||
| <li>1 tsp sugar</li> | ||
| <li>1½ tsp salt</li> | ||
| <li>½ cup pizza sauce</li> | ||
| <li>1½ cups shredded mozzarella cheese</li> |
There was a problem hiding this comment.
Not quite. Your diff should not include the recipe if you are solely adding the critic review. This diff still has the entire recipe on it.
Take a look at this PR that was closed for reference, this is what it should look like: https://github.com/SCE-Development/git-workshop/pull/426/changes
plusplusminusminus
force-pushed
the
plusplusminusminus/20260529_add_pizza_lore
branch
2 times, most recently
from
728a9ff to
ffd01c2
Compare
3 participants
Merge #441 first!