title: Merge parent branch into child branch
body: <p>I'm using bitbucket and sourcetree and I've done this:</p>
  
  <p>I have a develop branch. From this branch I have created a feature branch.</p>
  
  <p>After creating I have fix some errors on develop branch and push it to this branch only.</p>
  
  <p>How can I have these fixes in the feature branch? I think I have to merge develop branch into feature branch but I'm not sure because I'm new in git and I don't want to do something wrong that makes me lose develop branch. but now I want to have these fixes on my feature branch.</p>
  
  <p>What do I have to do?</p>