Updated git role: remove local cache, update template generation, change merge strategy from simple to upstream