DSW-Unit -Tools and Practices, Part 2

Summary

More advanced uses of git (branches, merge conflicts), End-to-end integration testing, Continuous integration.

Topics

• user stories
• issues in Github
• kanban
• github forks
• git branch
• git fetch
• git checkout
• git merge
• Dealing with merge conflicts
• Pull requests
• code review

Learning Objectives

• The student will demonstrate that they know how to fork a repo
• The student will demonstrate that they know how to create a new branch
• The student will demonstrate that they know how to switch between different branches
• The student will demonstrate that they know how to fetch branches from the server
• The student will demonstrate that they know how to merge code from one branch into another
• The student will demonstrate that they know how to resolve a merge conflict
• The student will demonstrate that they know how to make a pull request
• The student will explain the difference between a fork and a branch, and between a remote and branch
• The student will demonstrate that they know how to enter code review comments on a pull request
• The student will demonstrate that they know how to work with issues in Github
• The student will demonstrate that understand the idea of a Kanban board for tracking issues

UC a-g application information

Summary

In this unit added only to the honors section of the course, the student will learn about two practices that are a part of Agile software development: writing user stories, and managing those user stories through the software development process via a kanban board. The student will also learn about features of git/github that are designed to support software development teams, such as issues, branches, forks, and pull requests.

Key Assignment

A key assignment for this unit will be to develop user stories for an application that the student (or the student's team, if working in a team) is developing, to enter those stories into github as issues, setup a work flow for the team using branches or forks, and then move one or more stories through the kanban board to completion. Students will learn how to use the Agile software design methodology to manage a software project.

Activities