-
Notifications
You must be signed in to change notification settings - Fork 2
Git commit workflow
Git commit workflow for Storeman Installer
This is the commit workflow used for harbour-storeman-installer
.
Pull requests
│
▼
devel
branch ───► master
branch
All "horizontal" pull requests (i.e., from devel
to master
) must be regular merge commits, except for PRs comprising a single commit for which a "squash merge"-commit is also adequate (i.e., "squash merges" look slightly nicer in the commit log than a regular merge commit, which is also working fine). Hence stubbornly always performing merge commits "horizontally" is the rule of thumb.
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).