title: How to avoid git conflicts in a team?
body: <p>We are some developers who work on same project and we use git for the project. If two or more of us happen to work on same file, we receive git conflicts which are hard to deal with, sometimes changes done by one developer are lost when these conflicts happen.</p>
  
  <p>How do they work with git in a team? What should be the proper flow in order to avoid git conflicts ?</p>
  
  <p>Thanks in advance.</p>