Skip to content

Commit e3d230c

Browse files
Update changelog
1 parent 493f947 commit e3d230c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Use `workflow_dispatch` instead of opening an issue as the initial trigger of the release.
1313
Not only is this more convenient to use, it also fixes a security vulnerability that may have allowed users without write access to execute arbitrary code within the context of the repositories GitHub action.
14+
- Merge `master` in `dev` after a release branch is merged.
15+
Previously, we used to merge the `release` branch back into `dev`.
16+
However, this caused some issues because the actual merge commit was not present in the `dev` branch.
17+
It also prevented use of the "automatically delete head branch" feature of GitHub which works well together with the "PR retargeting" feature.
1418

1519
## [1.4.0] - 2020-02-22
1620

0 commit comments

Comments
 (0)