title: How to accept pushed changes on git remote repository?
body: <p>I have git cloned my git remote repository from my web server onto my local machine. After making changes on my local machine I have committed and pushed changes to the web server with the git remote repository, and see that there are changes when I run git status. But the only way I can think of implementing the change is to run git stash. I am sure this is the incorrect way. I have tried git fetch and git merge, but this is the remote repository that I attempting to update with changes from others for production.</p>
  
  <pre><code>git status
  # On branch master
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #
  #   modified:   test.txt
  #
  
  git stash
  Saved working directory and index state WIP on master: eb8230d Changes
  HEAD is now at eb8230d Changes
  </code></pre>