Tag server-side merges when incremental push tags are enabled
Merged #85 "Tag server-side merges when incremental push tags are enabled"