When the two development teams have to merge their code

master hacheka commited on 15 Oct 2014