We need to talk about our git workflow because the way we are doing it right now it’s not working.
This is what we are doing:
- Open new branch for each fix/feature.
- Push commits. None of them are tagged with
- Open PR and wait for review.
- Merge once approved. In the merge message, include
I really like that approach but it doesn’t work because it looks like the conventional changelog we are using (from lerna?) ignores merge commit messages, so our changelogs don’t reflect the fixes or features added.
My first suggestion to try is to squash our merges. I think then the merge commit message won’t be ignored:
It has some advantages. For example, the external contributors don’t need to write conventional commits in their PRs.
And it has some disadvantages. I think we will lose the individual commits of each fix/features branch.
Opinions? Any other suggestion?