Bumping when resolving merge conflicts

[baniasbaabe]

First of all, thanks for the nice repo. I noticed one problem with bumping when resolving merge conflicts:

I have three branches (dev, staging and main). Whenever I create a new feature, I create a feature branch and create a pull request to merge into dev. When passing, I merge feature into dev, which will trigger the workflow to automatically bump with alpha prerelease. Now, when I want to merge dev into staging, I get a merge conflict for my .cz.toml and CHANGELOG.md. When I resolve them, this results into a commit into dev again which triggers the workflow in dev again to bump it again which is unnecessary. The same problem arises when merging staging into main.

So: How to avoid those merge conflicts for my config file and CHANGELOG, and how to avoid a new triggered workflow with bumping when resolving merge conflicts? Thanks for any input.