git pull isn't possible, there are unmerged files
<p>I've read many other questions on this, and most answers involve doing git reset --hard origin/master, which makes us lose all of our committed changes, which i can NOT afford to do.</p>

<p>The following is the error message I receive in terminal:</p>

<p><a href="https://i.stack.imgur.com/KlHzi.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/KlHzi.png" alt="enter image description here"></a></p>

<p>How do I fix this? I just want to import the upstream version of master into my local master, and then push my changes to the upstream master. I know git reset --hard upstream/master will import the upstream changes to my local master, but I do not want to lose all my changes I've made.</p>