git pull and resolve conflicts
<p>I am learning git and I have a scenario:</p>

<ol>
<li>My coworker makes changes and pushes the changes to the master.</li>
<li>I make changes locally to my master.</li>
</ol>

<p>So far from my understanding, at this point I can either:</p>

<ol>
<li>Pull the master that my coworker worked on and fix the merge conflicts that I will end up having. </li>
<li>Create a back up of my local, clone a new copy of the master, and then merge my changes to the master. </li>
</ol>

<p>I want to know if there is any better way of doing this.</p>