title: Git - Fixing conflict between master and feature branch before pull request
body: <p>I have to make a pull request to a repo.
  I clone the project and it has only one branch : <code>master</code></p>
  
  <p>I checkout a new branch <code>feature</code> and commit my changes to this branch.</p>
  
  <p>I push my branch to Github and I'm now able to make a pull request. So I do it but it tells me now that I have conflicts.
  <a href="https://i.stack.imgur.com/vE1jr.png" rel="noreferrer"><img src="https://i.stack.imgur.com/vE1jr.png" alt="enter image description here"></a></p>
  
  <p>I understand the problem. <code>master</code> is ahead of <code>feature</code> because I didn't "pull" the last changes that have been made to master when I waas working on <code>feature</code>.</p>
  
  <p>How can I fix it ? How can I "pull" the last changes of master into my <code>feature</code> branch ?</p>