We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 250b6d3 commit cfe07f4Copy full SHA for cfe07f4
docs/gitflow.md
@@ -12,3 +12,9 @@ We use [Gitflow](https://docs.github.com/en/get-started/quickstart/github-flow)
12
- Never merge directly into `master` (unless we want e.g. an emergency bugfix release)
13
14

15
+
16
+## Important Caveats
17
18
+While a release is pending, we may merge anything into develop, **except for changes to package.json files**. If we
19
+change the package.json files on develop, the gitflow PR master -> develop will have merge conflicts, because during the
20
+release the package.json files are updated on master.
0 commit comments