Intermediate level · Module 2 of 6 · 13 guided hours
Collaborating with Git and GitHub
Work on code with others using branches, pull requests, code review and conflict resolution.
Learning objectives
- Use branches for features and fixes
- Open, review and merge pull requests
- Resolve merge conflicts calmly
Topics
- branching and switching
- commit history and diff
- pull requests
- code review etiquette
- merge conflicts
- issues and project boards
Lessons
-
Lesson 1 Branches and a Clean History
Create branches for each piece of work, write useful commits and read history and diffs.
branchgit switchgit diff and git logcommit messages
-
Lesson 2 Pull Requests and Code Review
Propose changes with pull requests, review others' code constructively and merge safely.
pull requestdescription and screenshotsreview commentsapproval and merge
-
Lesson 3 Resolving Merge Conflicts
Understand why conflicts happen and resolve them confidently.
merge conflictconflict markersupdating a branch from maintesting after a merge
Practical activity
In teams of three, build a small site together: each feature on a branch, every change through a reviewed pull request, and at least one merge conflict resolved.
Expected outcomes
- Confident team workflow with Git
- Constructive code review habits
Assessment
Review of the team repository: branch use, pull request descriptions, review comments and a resolved conflict.
Taught live by an instructor — online or in person. Free course lessons are for self-study and do not lead to a certificate — see registration options.