Fixed: Tags merged from other branches missing

I wasn't sure whether this was a bug I ran into or if the behavior was intentional and I needed an additional feature. To be safe I added it as a feature and you can use your judgement.

The situation I am in is as follows:
I am developing on a `develop` branch. `master` has had commits to it that were not in `develop`. The last commit to master was tagged with `sprint-4` to indicate a release. I updated my `develop