(for features, defects, etc. performed by the development team.)
In general, we follow the Github Flow. The following provides some additional clarifications on our flavor of the workflow:
For each ticket, the developer creates a feature branch. The feature branch should be named
t<ticket #>-<short description with words - separated>, e.g.,
t286-export-stream. For example, to create and checkout a feature branch:
git checkout master git pull origin master git checkout -b t286-export-stream
Note: In general, 1 development task = 1 ticket = 1 feature branch. However, where appropriate, variations are acceptable. In particular, a development task may be broken up into multiple tickets or multiple related tickets may be included in a single feature branch.
Developer does work and commits to feature branch. The developer is welcome to commit as often as necessary for development purposes. A commit to a feature branch may result in the code being “broken”. Each commit must be accompanied by a descriptive message.
Periodically, the developer should get the latest commits from master using rebase:
git checkout t286-export-stream git rebase master
When completed with the task, wanting to store your changes in the github repo (even if not complete), or wanting to collaborate with other team members, the developer pushes the branch to origin.
git push -u origin t286-export-stream
Caution: If other developers are working on your branch and you rebase, you can really mess things up. Once a feature branch has been pushed to origin, only rebase if no one else is working on it or are completed working on it.
When completed with the task and ready for code review, the developer cleans up the commit history using interactive rebase and issues a pull request.
The goal of the interactive rebase is to provide a clean history for other developers and to make sure that each commit to the master branch is stable. The combined commit message should start with the by referencing the tickets (e.g,
fixes #75, #78) and describe the entire code change. While generally the commits should be squashed to one commit, depending on the code change, they may be squashed to multiple commits. For more information on rebase, see Using Git rebase.
To create a pull request, in Github go to the branch and click the pull request button. Note that the pull request creates a ticket. The pull request ticket should be assigned to the tester. A reference to the original ticket should be placed in the pull request ticket and a reference to the pull request ticket should be placed in the original ticket.
The tester reviews and test the code. All comments should be placed in the pull request ticket. For commenting on a pull request see Commenting on the diff of a pull request.
For minor fixes only, a tester a code reviewer may make, commit, and push changes to the pull request branch.
Developer addresses issues, commits, rebases, and pushes changes.
These last two steps are repeated until all issues are addressed either by fixing or by documenting in additional tickets for later work.