DEV103 · Version Control and Collaboration with Git
About Course
Use Git and GitHub the way professional teams do: clean commits, branches, merges, conflict resolution, pull requests and code review. You will run a realistic team workflow on a small website repository, including undoing mistakes safely.
Who it is for
Developers, operations staff and technical writers who need to collaborate on code and configuration with version control.
Prerequisites
Complete DEV102 or be comfortable with basic command-line navigation and a text editor.
What you will be able to do
- Record work as small, well-described commits and inspect history with log and diff.
- Create, merge and rebase branches and resolve merge conflicts confidently.
- Collaborate through pull requests, code review and protected branches on GitHub.
- Choose a branching strategy for a team and undo mistakes safely with revert, restore and reset.
Lessons
- Lesson 1 · Git fundamentals: snapshots and history
- Lesson 2 · Branching, merging and conflicts
- Lesson 3 · Collaboration on GitHub and team workflows
- Lesson 4 · Lab and assignment
Lab: Run a team workflow on a shared repository
You will create a repository for a small business website, make commits on feature branches, open pull requests and review your own changes using a second branch as a simulated teammate. You will deliberately create and resolve a merge conflict, protect the main branch and recover from a bad commit with git revert.
Free tools: Git (free) on your computer, VS Code with its built-in Git tools, and a free GitHub account
Assessed assignment
Set up a GitHub repository for a small business project, such as a restaurant site or a configuration repository for an office server. Show a history of at least 15 meaningful commits across at least four feature branches merged through pull requests, including one resolved merge conflict and one reverted change. Configure branch protection on main, add a pull request template and a CONTRIBUTING.md that describes your branching strategy and commit message convention. Submit the repository link and a one-page reflection on the workflow you chose and why it fits a team of three to five people.
| Criterion | Weight | What excellent work looks like |
|---|---|---|
| Commit quality | 25% | Commits are small and focused, with clear imperative messages that explain the why. |
| Branching and merging | 30% | Feature branches, the resolved conflict and the revert are visible in history and handled correctly. |
| Collaboration setup | 25% | Branch protection, the pull request template and CONTRIBUTING.md are complete and consistent. |
| Reflection | 20% | The chosen strategy is justified with concrete trade-offs for a small team. |
Portfolio piece
A well-structured GitHub repository with a clean history, documented workflow and protected main branch.
Next step
Continue with DEV104 · Continuous Integration and Delivery (CI/CD) · 6 hours · $42.00
Course Content
DEV103 · Version Control and Collaboration with Git (6 h)
-
Lesson 1 · Git fundamentals: snapshots and history
-
Lesson 2 · Branching, merging and conflicts
-
Lesson 3 · Collaboration on GitHub and team workflows
-
Lesson 4 · Lab and assignment
-
DEV103 Assessment · Version Control and Collaboration with Git