title: Update my git working directory via EGit with Synchronise Workspace
body: <p>I'm working with the Git plugin for Eclipse. 
  To update my working directory, I used to do a <strong>Pull</strong> or a <strong>Fetch+Merge</strong>. When there is a conflict to resolve, I use the <strong>merge tool</strong>. But recently I tried a new approach. </p>
  
  <p>To see what have been changed by others, I do a <strong>Fetch</strong> and after that, a <strong>Synchronise Workspace</strong>. 
  If I try to do a <strong>commit and push</strong> after updating my code directly within the team synchronise view, I've got the "rejected-non-fast-forward" error. </p>
  
  <p>I want to know if I can update my working directory using the team synchronise view or if the only way to do that it's via the <strong>merge</strong> action of Egit.</p>