Git commit workflow

^{This is a copy of the same page at the Storeman Installer wiki, except for the project name, which is substituted in each of the first two lines.}

Git commit workflow for sfos-upgrade

This is the commit workflow used for sfos-upgrade.

 Pull requests
          │
          ▼

devel branch ───► master branch

All "horizontal" pull requests (i.e., from devel to master and from master to the release branches) must be regular merge commits, except for PRs comprised of a single commit for which a "squash merge"-commit is adequate (i.e., better than a regular merge commit, which is also working)!

Note that the basic idea is to accumulate commits via pull requests (PRs) merged into the devel branch, then move them in tranches (i.e., as PRs) into the master branch (which is subjected to different CI builds for quality assurance).