title: How can two developers work on same file using git
body: <p>I was using SVN last where two developers can work on same file . Suppose A developer edit the A.java on 31 line and Suppose B developer edit the A.java on 35 line.</p>
  
  <p>In case of SVN first A developer commit the code then if  B second developer take update then that SVN code merge on local sytem of second B developer then can commit.</p>
  
  <p>But this git does not allow. When two developers edited same file and one commited the source and other also edited same file it does not merge the code it gives below error.</p>
  
  <p>Any solution to this problem ?</p>
  
  <p>Thanks in advance.</p>
  
  <p><img src="https://i.stack.imgur.com/SLEnO.png" alt="enter image description here"></p>