Skip to content

robert/20260524_delete_recipe#390

Open
under-dogeey wants to merge 4 commits into
SCE-Development:mainfrom
under-dogeey:deleterecipebranch2
Open

robert/20260524_delete_recipe#390
under-dogeey wants to merge 4 commits into
SCE-Development:mainfrom
under-dogeey:deleterecipebranch2

Conversation

@under-dogeey
Copy link
Copy Markdown
Contributor

deleted orange chicken recipe because it was too similar to tonkatsu

@under-dogeey under-dogeey changed the title Deleterecipebranch2 robert/20260524_delete_recipe May 24, 2026
@evanugarte
Copy link
Copy Markdown
Contributor

this pr is adding a file, when it should only be deleting stuff. for the new html file, should that instead go in #389 ?

see the below youtube video on the sce youtube page for how to check the pr's "files changed" tab

@evanugarte
Copy link
Copy Markdown
Contributor

in addition to above, see #399 (comment) on how we can fix this pr's merge conflict

@under-dogeey
Copy link
Copy Markdown
Contributor Author

this pr is adding a file, when it should only be deleting stuff. for the new html file, should that instead go in #389 ?

see the below youtube video on the sce youtube page for how to check the pr's "files changed" tab

this pr is adding a file, when it should only be deleting stuff. for the new html file, should that instead go in #389 ?

see the below youtube video on the sce youtube page for how to check the pr's "files changed" tab

i only deleted the orange chicken recipe within that branch but for some reason it showed the recipe i added from the earlier commit within its history. is there a way to remove that history from this pr? if not should i redo the workshop again?

Comment thread dinner/tonkatsu.html
Comment on lines +9 to 12
<<<<<<< deleterecipebranch2
<h1>items</h1>
=======
<h1>Tonkatsu</h1>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we go through the files changed tab, make sure its only removing a file + associated entry in index.html

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