If only there was some kind of service that could sync git repos properly, some kind of 'hub' that could also deal with conflicts