René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Bumping when resolving merge conflicts","articleBody":"First of all, thanks for the nice repo. I noticed one problem with bumping when resolving merge conflicts:\r\n\r\nI 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.\r\n\r\nSo: 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. ","author":{"url":"https://github.com/baniasbaabe","@type":"Person","name":"baniasbaabe"},"datePublished":"2024-08-18T23:00:48.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":0},"url":"https://github.com/86/commitizen-action/issues/86"}