I have released API 1.0.0 in the master branch (default branch). Since then I have separately branched to branches
api2/bar, both containing backwards-incompatible changes.
The API version is declared in the source code. Should I bump the version to 2.0.0 in both api2/* branches, or in the master branch?
If I bump version in the master branch, the versions in the source code on api2/* branches will not be updated. If I am to release development builds for the branches, things in API 2 may be used when the project declares to be API 1. As a result, I have to merge the commit in the master branch that bumps the version, but I will mege other changes in the master branch altogether, and I don't want it to happen yet.
On the other hand, if I bump version in dev branches, there will be two commits bumping the versions, so when they are both merged into the master branch, there would potentially be conflicts.
What would be a good solution between these two options?