commitizen / commitizen/cz-cli

cz.json version mismatch merge conflict

Open
#846 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
JavaScript
Stars
17.5k
Forks
566
Avg merge
8h 16m
Merged PRs (30d)
1

Description

I am currently running the cz bump in my CI tool and I am committing both the bumped semantic tag and updated master branch with the new .cz.json version file.

My issue is that the source branch from the merge request still has the old version of the .cz.json so I am having to resolve merge conflicts on every merge request to get the most recent version that was committed from the prior bump.

What is the recommended approach to resolve this?

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.