Fix merge conflicts when tagging Gitaly
Gitaly tagging procedure allows developers to autonomously tag RCs from master branch.
If this happens on a commit more recent the SHA selected for tagging
the Gitaly monthly release this will fail the release job because merging
the stable branch into master requires conflict resolution on VERSION
and ruby/proto/gitaly/version.rb