> I don't think conflicts are a problem as long as a single history is kept up to date properly with git.

That is easy when you work alone. It becomes more difficult as your team grows in size.