Stash branches and product (NuGet) version numbers strategy

We are evaluating Stash and are wondering how to set the product version number (in the assemblyinfo files), which is then published to NuGet, when following the GitFlow branch model.

In our current (non-Git) repository we have a version.txt file which exists for each branch. This version.txt file is used (when we do a build) to update all the assemblyinfo files with this version number, and is used when publishing the assemblies to NuGet. However this version.txt file 'sticks' to each branch. i.e. we do not merge it from develop into master.

e.g. master has a version.txt file which contains "2.0.0"

      develop has a version.txt file which contains "2.1.0-dev"

      feature/MyFeatureA has a version.txt file which contains "2.1.0-featureMyFeatureA"

With our current repository when feature/MyFeatureA is merged into develop we merge all the files except the version.txt file. 

Now using Stash (git) we won't be able to do this because all the files will be merged, so after the merge the first thing we would have to do is update the version.txt file again to revert it back to '2.1.0-dev'. This wouldn't be particularly helpful for having a streamlined dev process for merging feature branch or bug fix changes.

Do you have a recommended approach for doing this? I did notice https://github.com/Particular/GitVersion which uses the branch name to derive the version number rather than using a version.txt file.

Craig

1 answer

Read this. The "Merge strategies" section describes very nicely how to apply "git merge -s ours" to solve this problem.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

176 views 20 8
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you