Git: how to git pull onto changed file
<p>I changed a file in my testing repository and <code>git push</code> the change.</p>

<p>Now I want to <code>git pull</code> to my developement repo. However the developement repo also has a change in the same file...so I want to merge the 2 changes together. </p>

<p>Git merge doesn't work <code>- not something we can merge</code></p>

<p>I ended up doing <code>git checkout &lt;file&gt;</code> to delete my changes and <code>git pull</code> then manually editing the changes back. But I would like to know if there is a better way to do this. </p>