Code / Command Line & Git / Unit 5: Final project

Ship the chai stall website चाय स्टॉल की वेबसाइट ship करें

Lesson 12 of 12 · about 25 minutes · Everything together: folders, files, commits, a feature branch, a merge and a clean status.

⚡ 0 XP

Step 1 of 1★ Final project

The developer workflow

Add menua1f3Add prices7c2eFix typo9b04HEAD→main

This is how real teams work every day:

  1. Keep main working and clean.
  2. Start each new feature on its own branch.
  3. Commit small, clear steps.
  4. Merge the feature back into main when it is ready.
  5. Check git status and git log to make sure everything is saved.

On a real project you would then git push your repo to GitHub, so your team (and the world) can see it, review it and deploy it. This practice terminal has no internet, but the workflow is exactly the same.

You also get one handy shortcut: git commit -am "msg" stages every already-tracked changed file and commits in one go (new files still need git add).

🎯 Challenge: Final: ship the chai stall website +50 XP

Build and ship the site from an empty home folder. Your checklist:

  1. Set your name with git config user.name "…".
  2. Make ~/chai-site with a css folder inside, and go into chai-site.
  3. Create index.html containing Asha's Chai Stall and css/style.css (any CSS).
  4. git init, add everything, and make the first commit.
  5. Create a branch diwali-menu; on it create menu.txt with Kaju katli ₹40 and commit.
  6. Switch back to main; add a line containing Open 7am to 9pm to index.html with >>, and commit.
  7. Merge diwali-menu into main (a merge commit), then check git log --oneline and git status.

The tests check: the repo at ~/chai-site, your name set, at least 4 commits on main, the merge commit, the merged branch, index.html with the hours, menu.txt with kaju katli, css/style.css committed, and a clean status.

Try twice to unlock the solution (0/2)

terminalCtrl ⏎

A safe practice terminal. Type a command and press Enter. Type help to list commands. Tab completes names, ↑ recalls the last command.

Files · ~ = /home/asha

Your home folder is empty.

Git timeline

No git repository yet. Start with git init.

Checklist

Press Run to check your code.

  • ~/chai-site is a git repo
  • Your name is set
  • main has at least 4 commits
  • The latest commit is a merge commit
  • diwali-menu is merged into main
  • index.html has the stall name and hours
  • index.html names Asha's Chai Stall
  • menu.txt with kaju katli is on main
  • css/style.css is committed
  • Working tree is clean
Lesson notes (text version)

1. The developer workflow

This is how real teams work every day:

  1. Keep main working and clean.
  2. Start each new feature on its own branch.
  3. Commit small, clear steps.
  4. Merge the feature back into main when it is ready.
  5. Check git status and git log to make sure everything is saved.

On a real project you would then git push your repo to GitHub, so your team (and the world) can see it, review it and deploy it. This practice terminal has no internet, but the workflow is exactly the same.

You also get one handy shortcut: git commit -am "msg" stages every already-tracked changed file and commits in one go (new files still need git add).

Challenge: Final: ship the chai stall website

Build and ship the site from an empty home folder. Your checklist:

  1. Set your name with git config user.name "…".
  2. Make ~/chai-site with a css folder inside, and go into chai-site.
  3. Create index.html containing Asha's Chai Stall and css/style.css (any CSS).
  4. git init, add everything, and make the first commit.
  5. Create a branch diwali-menu; on it create menu.txt with Kaju katli ₹40 and commit.
  6. Switch back to main; add a line containing Open 7am to 9pm to index.html with >>, and commit.
  7. Merge diwali-menu into main (a merge commit), then check git log --oneline and git status.

The tests check: the repo at ~/chai-site, your name set, at least 4 commits on main, the merge commit, the merged branch, index.html with the hours, menu.txt with kaju katli, css/style.css committed, and a clean status.

Search by task, format or tool name.