 Conflicts are dealt with at check-in time.To improve performance for remote clients, Azure DevOps includes the ability to install Proxy Servers.Proxy servers allow source control contents to be cached at a site closer to the developers to avoid long network trips and the associated latency.