Git - How to get latest fix while working on a new feature?

Git - How to get latest fix while working on a new feature?

I'm using Git and I'm new to it. I have the latest code of a project, and
I'm working on a new feature but while I'm working on that new feature I
received an email of a fix I need that is commited but I do not have it
yet. Unfortunately I can't 'get latest version' like with svn (and merge
if needed) as the new feature file seem to be blocking the pull even if
the new feature file are not common with the fix I need to get. What is
the best way to do it for both scenario: 1) I have no common files
modified with the new file I need, scenario 2) I have common file modified
(I just want to do a quick local merge basically like with svn)? thanks w