Wendy/20260527 add food critic#418
Open
wendyxta wants to merge 1 commit into
Open
Conversation
Merged
Contributor
|
there are some merge conflicts, watch the video below on how to resolve them |
wendyxta
force-pushed
the
wendy/20260527_add_food_critic
branch
from
07aec9f to
c416dcc
Compare
epicgdog
reviewed
Jun 3, 2026
Comment on lines
+34
to
+38
| <div> | ||
| <h1> Food Critic Review </h1> | ||
| <h3> Rating: ★★★★★ </h3> | ||
| <h3> Comment: Amazing. Best brisket in all of Texas! </h3> | ||
| </div> |
Contributor
There was a problem hiding this comment.
This should be the only thing added in this diff. I see the recipe from #416 , but that same recipe is also added here which is wrong as well as your edits for index.html. Only a critic review should be added. Take a look at this pr for an example:
https://github.com/SCE-Development/git-workshop/pull/426/changes
Rebasing to your #416 branch should be the fix here.
Contributor
There was a problem hiding this comment.
Looks like #416 was merged, rebase this to main
wendyxta
force-pushed
the
wendy/20260527_add_food_critic
branch
2 times, most recently
from
5074124 to
cb8f9c3
Compare
wendyxta
force-pushed
the
wendy/20260527_add_food_critic
branch
from
cb8f9c3 to
50fe04b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
merge #416 first!