gitmoji-changelog and gitflow

[jancama2]

I'm using simplified gitflow for my app (master = production, stage = testing and development). I merge development to stage and stage to production. I release versions on stage and master. New versions on master are normally some bug fixes thus new patch versions. New versions on stage can be all the types of versions.

I've recently ran into a situation where gitmoji-changelog acted weirdly for me.

Situation

• master branch including version 1.12.5 and I've added a new bugfix 1.12.6
• stage branch including version 1.12.5 and 1.13.0

Problem

I've tried to integrate the new version 1.12.6 to stage from master via both rebase and merge, but when releasing a new version 1.13.1 on stage gitmoji-changelog duplicated all the changes from 1.13.0 to the changelog of version 1.13.1 too.

I've tried several approaches when moving 1.12.6 from master to stage. Rebase and put changelog of 1.12.6 between already created changelogs of 1.12.5 and 1.13.0. Rebase and put changelog of 1.12.6 after 1.13.0. Merge and put between, merge and put after. But no matter what, every time I then created a new 1.13.1 version, its generated changelog included changes from 1.13.0.

Question

Is there any recommended way how to approach these situations? In the end, the only solution for me was manually delete all the duplicates so 1.13.1 includes only its changes.