git - ignore the modified files in site1 : we have site1 & site2 . 

From site 2 , when we tried to pull using below command, we got below error :

**git pull staging development**

[![enter image description here][1]][1]
[![enter image description here][3]][3]

so we tried this command : **git stash pop**

now it displaying like this :

[![enter image description here][2]][2]

I want all site1 changes to be overrided by site2.


  [1]: http://i.stack.imgur.com/trRop.png
  [2]: http://i.stack.imgur.com/uyJh8.png
  [3]: http://i.stack.imgur.com/W48re.png