16. Feature Branch Development

Date: 2020-06-02

Status

Accepted

Context

We have a small team. We enjoy pairing when possible. Pull Requests add an extra layer that isnt’ necessary in the projects we do.

We have a master and production branch. When new work starts:

git checkout master git town sync git town hack dje_new_feature git town sync git town ship

Decision

We will use feature branches from master that are prefixed with the developers initials and a brief feature description. That branch will be squash merged back to master when the work is complete. Master will be merged to production as determined by the project manger. Production is then deployed out.

Consequences

The development process allows developers to hop from feature to feature and keep track of where they are. git town allows branches from branches in the case where development needs that functionality. It also handles the squash merging for the user.