title: git - how to handle confilicts
body: <p>Here is the scenario:</p>
  
  <p>User A and B has the same source code. User A makes a changes => add => commit => push. The source code in remote repository is changed.</p>
  
  <p>User B start changing without pulling. (or maybe changes in remote repository is applied <strong>after</strong> user B pulled the repository) Then he also wants to push. At this moment, conflict occurs. I searched a lot and couldn't find any solution, but to <strong>edit conflicts manually</strong>.</p>
  
  <p><strong>Question:</strong> Is editing conflicts manually an efficient way? Specially in a big project? What is the approach?</p>