Collaboration & Agile Fundamentals
Use this page to revise the vocabulary of Git and Scrum.
Git concepts
A repository holds history; the working directory is your checkout; the staging area assembles a commit; a branch is a line of development; a remote is a hosted copy. A feature-branch workflow uses merge/pull requests instead of committing straight to main. A merge conflict is two edits to the same lines. .gitignore keeps build artefacts, binaries, and secrets out.
Scrum
- Roles: Product Owner, Scrum Master, Developer.
- Events: Sprint Planning, Daily Scrum, Sprint Review, Sprint Retrospective.
- Values: Courage, Focus, Commitment, Respect, Openness.
- Artefacts: Product Backlog, Sprint Backlog, Increment. User stories, acceptance criteria, Definition of Done. MoSCoW. Burndown/burnup charts.
For firmware, Done usually includes a device someone else can power and a flash recipe, not only a green pipeline.
Starting Points
- Chacon, S., & Straub, B. Pro Git (2nd ed.). git-scm.com.
- Scrum.org. What is Scrum?
- Version control & Git workflow
- Agile project execution
Key Points
- You can explain repository, commit, branch, remote, and feature-branch workflow.
- You can explain why merge conflicts happen and how you resolve one.
- You can name the three Scrum roles and the Scrum events.
- You can identify Product Backlog, Sprint Backlog, and Increment.
- You can explain MoSCoW and what a Definition of Done should include for a device.