Skip to content

Branching strategy

Nathaniel Paulus edited this page Jul 12, 2023 · 2 revisions

We use trunk-based development. The development branch is master. The sf-qa and sf-live branches generally point to a place on the master branch. The only exception is when a hotfix is created, which will cause them to diverge until the next time we ship, at which point they will be hard reset back to a commit on master.

Site Development Branch QA Branch Live Branch
Scripture Forge master sf-qa sf-live
Clone this wiki locally