Branching strategy

[siennathesane]

I've noticed recently we've had to do a few merges and I've fixed some conflicts on my end.

Currently we're using the topic branch strategy, and I'd like to move to the long-running branch strategy. See: https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows

Using the long-running branch strategy is pretty common, and it would allow us to make and merge changes as needed for development, then we'll merge into master for production releases. The goal is to protect master a bit and not have to worry about merges or other conflicts in master. We can resolve all of that in develop (or whatever we want to call it) and then each merge into master is a new release.

Thoughts?