[core-workflow] GitHub Workflow
Oleg Broytman
phd at phdru.name
Thu Mar 17 05:48:44 EDT 2016
An interesting example of GitHub Workflow (used by Frameworks team at BBC
News): http://www.integralist.co.uk/posts/github-workflow.html
The basis of their workflow is this:
-- Open a GitHub PR (Pull Request) by creating a new feature branch
from master
-- Make feature specific changes and request a code review
-- If given a "thumbs up", this means the PR author is allowed to
handle merging the PR
-- The merge process requires a set of sub steps (see below)
The steps (in summary) are:
-- Interactively rebase master onto the feature branch
-- Squash all feature commits into a single commit:
-- (this isn't exactly a squash)
-- the first line of the commit message should be the same as the
GitHub PR title
-- As part of the rebase ensure:
-- the author(s) is mentioned in the commit message
-- the PR is mentioned (and any associated issues as well)
-- Move back to the master branch and cherry-pick in the newly squashed
feature commit
Oleg.
--
Oleg Broytman http://phdru.name/ phd at phdru.name
Programmers don't die, they just GOSUB without RETURN.
More information about the core-workflow
mailing list