title: Resolving Git conflicts in SourceTree
body: <p>I was using NetBeans GIT plugin before, then I've decided to switch to SourceTree, as it is more efficient and powerful. As a newcomer to SourceTree I've managed to figure out basic Pull, Push and Commit workflows.</p>
  
  <p>However, I got stuck when there were file conflicts when merging with my friend's work. In NetBeans if there are any conflicts, the plugin suggest to resolve it in a popup and I just want to go to the conflict resolving interface and accept the correct code chunk by clicking a button. That was simple.</p>
  
  <p>In SourceTree, there is something called External Merge Tool which didn't work well for me. When I right click on the file with conflicts, it just opened up two files side by side and there were arrows pointing left to right in the middle. There is a dropdown at the bottom of the screen to select the arrow direction. </p>
  
  <p>I tried to use this interface to resolve conflicts, but I failed. It didn't fix the conflicts and merged two files.</p>
  
  <p>As I searched through the internet I found that some people use external SourceTree conflict solving plugins to merge. Actually I'm little lost here. That's why I've decided to post this problem here as this might help someone like me one day.</p>
  
  <p>I know there are lots of people who have been using SourceTree for a long time. Could any of them please tell me, how to resolve conflicts in SourceTree effectively?</p>
  
  <p>Should I use an external plugin or should I use the External Merge Tool (if so, how can I use this)? </p>