[GuyM142]

I know there have been many posts about this issue in the past, but the main reason I ask this is to check if there was any progress about it in recent years.

Our programming team has expanded and we are looking for ways to work on the same project from several computers,
as of today we are working with git but it seems hard to resolve conflicts when they happen.

Are there any teams using any kind of source control that is easy to use and works well with vi's? If you use git are there any tips of avoiding conflicts or handling them better?

Thank you!