Stage one coherent change
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.
Want more background?
The idea in everyday life
Continue the repair-cafe repository after lesson 1.
The index is a proposed next snapshot; staging is not the same action as committing.
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. Read the difference
Run git diff and identify the removed/added Bring line.
git diff -- notice.txtYou should see: The new line adds the word small.
Review detects accidental edits before history records them.
2. Stage precisely
Stage only notice.txt, then inspect the staged diff.
git add notice.txt git diff --stagedYou should see: The staged diff contains that one-line replacement.
Naming one file prevents unrelated files from entering the commit.
3. Test staged versus working
Add a fourth line, Access: step-free entrance, and save without staging. Run both diffs.
git diff --staged git diffYou 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. 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 HEADYou should see: Both intended edits are saved; count is 2.
One coherent commit explains the whole notice clarification.
What to finish
A second commit plus notes explaining the two diff views.
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.
Quick knowledge check
Answer all 3 questions. Get at least 2 right and the lesson completes automatically.
You’ll get an explanation for each answer. Signed in? Your results save to your account.
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 checkOptional course overview video · same video as Lesson 1
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.
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.