Fixes #380 but on 3.0 branch

[johannesegger]

Ok made the fix on the 3.0 branch for merging

[JakeGinnivan]

This looks great, thanks! Thought it can't be merged automatically. If you would like to fix this yourself (not sure how familiar you are with git) steps below, otherwise I will merge manually tonight or tomorrow.

# If you don't have the main repo setup as a remote
git remote add upstream git@github.com:ParticularLabs/GitVersion.git 

# create a feature branch
git branch betterMergeMessageParsing 

# Get latest changes
git fetch upstream

# Update your local release/3.0.0 branch to match upstream
git reset --hard upstream/release/3.0.0

# Go to your feature branch
git checkout betterMergeMessageParser

# Rebase your changes on the release/3.0.0 branch
git rebase release/3.0.0

If you are unsure what rebase does, check out http://onlywei.github.io/explain-git-with-d3/#rebase - it is super handy.

Then my workflow when doing things normally is:

git fetch upstream
git checkout release/3.0.0 # or master..
git merge upstream/release/3.0.0  # or upstream/master
git checkout -b MyFeatureBranch

Then I am ready to go on an updated feature branch. As I said, feel free to do this or not. Just posted in case it is helpful to you

[bradphelan]

Yeah I'm good with git. I was using a colleagues account at work. I should have created you a feature branch ( we use git flow at work. Was just being lazy getting the quick fix done. ) However I won't be able to do the rebase until 7am tomorrow GMT+1. I'll check tomorrow and see if it's done or not.

Thanks for the neat tool. That and git flow are making our release process a bit less of a nightmare :)

[JakeGinnivan]

Thought that would be the case, could probably assume that with most PR's on this project but always like to make sure. I found it helpful when starting out with git and figuring workflows.