CSE21 · Web, API & secure coding
Git Branching Treasure Map
Follow a team as it branches, commits, merges and resolves a conflict, then read the history graph.
🎯 You will learn to
- Create branches and commit
- Merge and resolve a conflict
- Read git log --graph
📘 Guided lab
This mission is a guided walkthrough: follow the steps on your own computer or practice account. The in-browser simulator for it is planned for a later release.
✅ Steps & checkpoints
🗺️ Branch and merge graph
Two feature branches split from main; one merges cleanly, the other conflicts and is resolved before merging.
The 2D diagram shows the exact flow, ports and trust boundaries. The 3D scene is a concept view of the same parts; packets travel along the same arrows.
🤔 Think about it
Why do teams use short-lived branches?
🛡️ Safety & cost
The APIs are mocks inside this page. Identities and data are fictional.
🧹 Cleanup
Nothing to clean up.
📚 Reference documents
- Pro Git book · Git
- An overview of HTTP · MDN
- OWASP Top Ten · OWASP
- Accessibility · MDN
Official sources, checked on 5 Nov 2026. Cloud services change often; check the official page before relying on a feature. All references