Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Please consider these guidelines when filing a pull request:

## Creating releases

To create a release, you must create a pull request from the develop branch into 'master' using the 'Rebase and merge' option. Once this has been approved it will automatically run the pipeline to generate a new release. [example](https://github.com/UserOfficeProject/user-office-core/pull/1621)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure about the 'Rebase and merge' option?
I would have thought it would be a normal merge. For example if there were hotfixes on master between releases this option would 'duplicate' the commits from develop by reapplying them on top of master?


After this, create a new pull request merging 'master' into 'develop' using the 'Rebase and merge' option. There should be no files changed, but the commits listed. This is to ensure the branches remain in sync. [example](https://github.com/UserOfficeProject/user-office-core/pull/1623)

UserOfficeProject/user-office-core uses [semantic-release](https://github.com/semantic-release/semantic-release)
to release new versions automatically.

Expand Down
Loading