> In software engineering, continuous integration (CI) is the practice of merging all developers' working copies to a shared mainline several times a day. [1]

That certainly does help with avoiding conflicts. There are only so many conflicts that you can pick up in a few hours of work.

[1] https://en.wikipedia.org/wiki/Continuous_integration