<p>I used <code>git pull</code> and had a merge conflict:</p>
<pre><code>unmerged:   some_file.txt

You are in the middle of a conflicted merge.
</code></pre>
<p>How do I abandon my changes to the file and keep only the pulled changes?</p>

I think it's
```
git reset
```
you need.
Beware that
```
git revert
```
means something very different to, say,
```
svn revert
```
- in Subversion the revert will discard your (uncommitted) changes, returning the file to the current version from the repository, whereas
```
git revert
```
"undoes" a commit.
```
git reset
```
should do the equivalent of
```
svn revert
```
, that is, discard your unwanted changes.