From 29fc2f59f8157cb7174de4083575911144efa8ae Mon Sep 17 00:00:00 2001 From: Mahmoud Mirghani <120668290+mahmoudmerghani@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:28:18 +0200 Subject: [PATCH] Update project_restaurant_page.md --- .../project_restaurant_page.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/organizing_your_javascript_code/project_restaurant_page.md b/javascript/organizing_your_javascript_code/project_restaurant_page.md index 6730aa551cb..3c236292fc1 100644 --- a/javascript/organizing_your_javascript_code/project_restaurant_page.md +++ b/javascript/organizing_your_javascript_code/project_restaurant_page.md @@ -45,13 +45,13 @@ You don't need to know exactly what all the commands do - as long as you follow 1. Make a new branch to deploy from by running `git branch gh-pages`. You only need to do this the first time you deploy. The rest of the steps should be done every time you deploy or redeploy your project. 1. Make sure you have all your work committed. You can use `git status` to see if there's anything that needs committing. -1. Run `git checkout gh-pages && git merge main --no-edit` to change branch and sync your changes from `main` so that you're ready to deploy. +1. Run `git checkout gh-pages && git reset --hard main` to change branch and sync your changes from `main` so that you're ready to deploy. 1. Now let's bundle our application into `dist` with your build command. For now, that's `npx webpack`. 1. Now there are a few more commands. Run each of these in order: ```bash git add dist -f && git commit -m "Deployment commit" - git subtree push --prefix dist origin gh-pages + git push origin `git subtree split --prefix dist gh-pages`:gh-pages --force git checkout main ```