Skip to content

Conversation

@Arun-M1
Copy link
Contributor

@Arun-M1 Arun-M1 commented Dec 21, 2025

Merge #262 first!

@Arun-M1
Copy link
Contributor Author

Arun-M1 commented Dec 21, 2025

I am not sure how to remove index.html from "files changed" as this was the requested change I had in previous pr.

Screen Shot 2025-12-21 at 1 31 19 AM 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?

@evanugarte
Copy link
Contributor

evanugarte commented Dec 21, 2025

@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

@Arun-M1 Arun-M1 force-pushed the arunmurugan/20251221_add-food-critic-or-recipe-lore branch from 6f123af to 83fae5c Compare December 21, 2025 19:47
@Arun-M1
Copy link
Contributor Author

Arun-M1 commented Dec 21, 2025

Hi @evanugarte can you please verify if I did this correctly? I followed your video tutorial and only have recipe.html changes committed here.

@evanugarte
Copy link
Contributor

evanugarte commented Dec 21, 2025

lets merge your first two prs then we can update this one

@Arun-M1
Copy link
Contributor Author

Arun-M1 commented Dec 21, 2025

Okay. I will wait for the merge first.

@evanugarte
Copy link
Contributor

ok lets try this, the below will explain how to update this pr

https://www.youtube.com/watch?v=ypiJfHblzGQ

@Arun-M1 Arun-M1 force-pushed the arunmurugan/20251221_add-food-critic-or-recipe-lore branch from 83fae5c to d7cae55 Compare December 22, 2025 05:00
@Arun-M1
Copy link
Contributor Author

Arun-M1 commented Dec 22, 2025

@evanugarte instructions followed. Conflicts are no more appearing.

Comment on lines +36 to +37
<<<<<<< HEAD
=======
Copy link
Contributor

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

Copy link
Contributor Author

@Arun-M1 Arun-M1 Dec 22, 2025

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants