commitizen / commitizen/cz-cli

cz.json version mismatch merge conflict

Ouverte
#846 0 commentaires 0 réactions 0 personnes assignées Voir sur GitHub
Langage dominant
JavaScript
Étoiles
17.5k
Forks
566
Merge moyen
8 h 16 min
PR mergées (30 j)
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?

Guide de contribution

Ouvrir le guide de contribution

Évaluation

Cette issue n'a pas encore été évaluée.

Recevez les nouvelles issues par e-mail

Un résumé court des issues GitHub adaptées aux débutants.