title: `git pull origin master` into my checkout feature branch
body: <p>I have a created a <code>feature</code> branch from <code>master</code>.</p>
  
  <p>A week before, after completing my <code>feature</code> branch work say a message <code>This branch has conflicts with the base branch</code> in my pull request</p>
  
  <p>To resolve these conflicting files, I did <code>git pull origin master</code> into my <code>feature</code> branch.<br>
  Now I am seeing all the commits from <code>master</code> is pulled into my branch and my pull request shows all my work additionally others work as well. </p>
  
  <p>How do I solve this?</p>