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.
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?