title: How to resolve conflicts while merging and updating files in git?
body: <p>I feel I am approaching this all wrong.</p>
  
  <p>I work as part of team and we use git. Now, when I pull updates from my team there are obviously conflicts from time to time - git seems to insert loads of text in the files which isn't good.</p>
  
  <p>Anyway, is there a decent way to manage these conflicts (I'm on windows).</p>
  
  <p>I used winmerge, but from what I can see, It can only compare 2 directories. It makes resolving conflicts a breeze, but requires me to have 2 states of the source in 2 different locations.</p>
  
  <p>Does anybody know a better way to do this or how to integrate the two?</p>