The Life Starter
0 of 6 complete0%
Course Library · Lesson 2 of 6
Digital · Guided lesson

Stage one coherent change

About 28 minutes · 6 reading + 22 practice and checks
Time includes reading, practice, and questions. Extra videos or further study are optional.
See this course’s project requirements

A local repository with a readable change history, two merged contributions, a resolved practice conflict, and an evidence-based review note.

Keep your working files in your own notebook or software. Save a private description, checklist, and work link in My Proof.

What to include

  • Base and clarification commits.
  • Review note grounded in an actual diff.
  • Merged independent title contribution.
  • Resolved hours conflict using the approved policy.
  • Final files, history evidence and recovery note.

Review and revise

Use these criteria to check your work and choose what to improve.

  • History records meaningful changes.
  • Final notice matches all four required lines.
  • Conflict resolution retains unrelated content.
  • Review and recovery claims are accurate.
Open the full course project
Want more background?
Before you begin

The idea in everyday life

Continue the repair-cafe repository after lesson 1.

The idea

The index is a proposed next snapshot; staging is not the same action as committing.

Follow along

Stage one coherent change — guided practice

Use diffs to separate saved, staged and working content.

Start with main at its one base commit. Edit Bring: one item to Bring: one small item in notice.txt and save.

  1. 1. Read the difference

    Run git diff and identify the removed/added Bring line.

    git diff -- notice.txt

    You should see: The new line adds the word small.

    Review detects accidental edits before history records them.

  2. 2. Stage precisely

    Stage only notice.txt, then inspect the staged diff.

    git add notice.txt
    git diff --staged

    You should see: The staged diff contains that one-line replacement.

    Naming one file prevents unrelated files from entering the commit.

  3. 3. Test staged versus working

    Add a fourth line, Access: step-free entrance, and save without staging. Run both diffs.

    git diff --staged
    git diff

    You should see: Staged diff shows the Bring edit; ordinary diff shows the Access addition.

    Staging captures content at that moment, not every later edit.

  4. 4. Complete the contribution

    Stage the updated notice and commit. Count history.

    git add notice.txt
    git commit -m "Clarify item size and entrance"
    git rev-list --count HEAD

    You should see: Both intended edits are saved; count is 2.

    One coherent commit explains the whole notice clarification.

Now change one thing

A staged file says Seats: 8. You save Seats: 9 without another add. Enter the seat number the next commit would contain.

Your work

What to finish

A second commit plus notes explaining the two diff views.

Common mistake

Watch for this

Assuming git add keeps a file automatically staged after subsequent edits.

How can I tell I understand it?

Complete the changed case, explain your result, and pass the three application checks.

Try 3 questions

Quick knowledge check

Answer all 3 questions. Get at least 2 right and the lesson completes automatically.

Not yet passed

You’ll get an explanation for each answer. Signed in? Your results save to your account.

1A staged note says Tuesday; the file later says Wednesday without another add. What gets committed?
2You intend to save only agenda.txt but have unrelated changes in costs.txt. Which command is focused?
3git diff is empty but git diff --staged contains a change. What is happening?
0 of 3 answeredApply the lesson to a short question, then review the explanation.
2
Finish this lesson

Pass the check. We’ll save the progress.

Answer all 3 questions above and get at least 2 right. You can review the explanations and try again.

Go to the knowledge check
Optional course overview video · same video as Lesson 1
Missing SemesterLecture 6: Version Control (git) (2020)YouTube
Optional course overview

Lecture 6: Version Control (git) (2020)

From Missing Semester. Watch here or open it on YouTube .

Optional course overview. Follow the written steps below at your own pace.
Tools, templates, and lesson sources

Tools and templates

Tools open in a new tab so you can keep your place here.

Sources and further reading

Explore the references behind this lesson.

Pro Git: Recording Changes
Source & access notes · checked 2026-09-12

Opened and inspected on 2026-09-12: Tracked, staged and modified states.

Access: Free public web page; no paid enrollment required.

Reuse: CC BY-NC-SA 3.0 book; link only.

Report a problem with this lesson

Tell us what went wrong. Please leave out personal information and private project contents.

No sign-in needed.