-
Notifications
You must be signed in to change notification settings - Fork 46
Arunmurugan/20251221 add food critic or recipe lore #274
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Arunmurugan/20251221 add food critic or recipe lore #274
Conversation
|
I am not sure how to remove index.html from "files changed" as this was the requested change I had in previous pr.
This is the current setup I have when I make the pr. I made my branch from my recipe branch and only changed the recipe.html file as requested but somehow index.html shows up. I assume that it won't appear if #262 is merged?
|
|
@Arun-M1 https://www.youtube.com/watch?v=ZUD_a1SdruA specifically see "resetting branch to main" and "copying changes back in" sections, we can undo the index.html changes |
6f123af to
83fae5c
Compare
|
Hi @evanugarte can you please verify if I did this correctly? I followed your video tutorial and only have recipe.html changes committed here. |
|
lets merge your first two prs then we can update this one |
|
Okay. I will wait for the merge first. |
|
ok lets try this, the below will explain how to update this pr |
83fae5c to
d7cae55
Compare
|
@evanugarte instructions followed. Conflicts are no more appearing. |
| <<<<<<< HEAD | ||
| ======= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we get rid of these lines
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May I ask why those lines need to be removed? I thought the task was to add a food review. The lines I see highlighted is the entire food review section.

Merge #262 first!