Hello, has anyone had problems doing rebase and merge in a collaborate work? We are working of four people and for the last two weeks, we have had many problems in merge the diferents brnachs. Since Wednesday the pltaform bloked us saying that there is a merge in progress and as of today, SAturday, support has no given us any solution.