title: how to work with Git merge and update my working directory?
body: <p>I download the last version from the server with</p>
  
  <p><code>git fetch</code></p>
  
  <p>as far as I understood now the repository is updated.</p>
  
  <p>I have two questions :</p>
  
  <ol>
  <li><p>Now I worked on file that was changed from the server and I want to do the merge ?
  when Do I need to do the merge ? Do I need to do it after the git fetech or when I do the add files ? could you please exaplain me what should be the statmentes for the merge process ?</p></li>
  <li><p>If I want to update my workign directory and I don't have any merge How I can do it ?
  I tried to do it with  :</p>
  
  <p><code>git checkout -f "mybranch"</code><br>
  <code>git rebase</code><br>
  <code>git checkout "mybranch"</code></p></li>
  </ol>
  
  <p>is it ok ? Do I have different way ?</p>