title: SmartGit and Git How to compare with remote?
body: <p>I'm quite new with git (and all version control software). I've installed SmartGit 3 as my graphical interface. I've create a bare repo and cloned it. What i'd like to know, is how am I supposed to pull from the server (without overwriting), compare the modifications (changes) between my current local version and the one from the remote server, and select the changes I want to keep (like in meld or kdiff3).</p>
  
  <p>As we speak, when I pull from the server, it completely overwrite my local version, and when I push, it overwrite the remote server's version with the local one (last commit).</p>
  
  <p>I want to be able to compare the differences between my local version and the remote version when I pull and/or push.</p>
  
  <p>I tried to figured out how to do it, but just can't find it. I've seen a friend of mine doing something similar with git gui (I think he was merging something, but I am not sure).</p>
  
  <p>Anyway, I'm sure there's something I understand wrong, but if someone could help me with the procedure of how to do it (using SmartGit 3), would be really helpful.</p>