← Back to Week 2

January 12, 2026

Class Summary

Today's class focused on Git collaboration. I worked with Winson and Kenneth on a shared repository to practice:

Collaborating on the same repo with multiple people
Using git pull to fetch and merge remote changes
Merging branches with git merge
Rebasing with git rebase
Resolving merge conflicts

In-Class Activity

We collaborated on a shared repository, each creating our own HTML files:

In-Class Exercise 3 Git collaboration with winson and kenneth

Screenshots

Git commit history showing group collaboration — Commit history showing contributions from all collaborators

Git merge conflict resolution — Resolving a merge conflict during collaboration