You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Master branch is stable and used for releases (on tags)
Develop branch is current and used for merging feature branches and staging for the release. Develop should only ever depend on master (released) versions of modules.
Feature branches are personal branches used for development. Feature branches may depend on any branch of modules, but must depend on master versions before merging to develop.
Hotfix branches are small fixes going directly off/to main with release fixes. Those need to also be merged to develop immediately.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
Masterbranch is stable and used for releases (on tags)Developbranch is current and used for merging feature branches and staging for the release.Developshould only ever depend on master (released) versions of modules.Feature branches are personal branches used for development.
Feature branches may depend on any branch of modules, but must depend on master versions before merging to develop.
Hotfix branches are small fixes going directly off/to main with release fixes. Those need to also be merged to develop immediately.
Squash merging to the
Developbranch can be enforced on a by-repo basis using the GitHub ruleset "Require Linear History", more info here: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesetsAs discussed/agreed in: #4
Further dicussed in: #28
Master/Main branch name discussed in: #6
Beta Was this translation helpful? Give feedback.
All reactions