Create a NEW empty practice folder; run commands one at a time and inspect each result.
git init -b main
Configure an appropriate local author name/email if Git requests it; use your own values, not fabricated identity.
Create README.txt describing the exercise and schedule.txt containing: Opens at 09:00
git add README.txt schedule.txt
git commit -m "Add workshop handbook baseline"
git switch -c early-check-in
Edit schedule.txt to: Opens at 09:30
git add schedule.txt
git commit -m "Propose early check-in time"
git switch main
Edit schedule.txt to: Opens at 10:00
git add schedule.txt
git commit -m "Set workshop opening time"
git merge early-check-in
Expect an overlapping-line conflict. Inspect both intentions. Replace the conflict region with:
Opens at 10:00; early check-in at 09:30
Check the entire file, then:
git add schedule.txt
git commit -m "Resolve opening and early check-in schedule"
git status
git log --oneline --graph --all
Create a separate typo commit and correct it with another focused commit or a documented revert.
Optional handover: git bundle create workshop.bundle --all
No remote repository, push, force push or destructive reset is required.
