title: git - from a local branch how to pull down commits from master
body: <p>i actually do not work on master. i work off a develop. The entire team works on develop. I am creating a feature so i created a local feature branch called "feature/myAnalytics".</p>
  
  <p>Now the feature is complete but our team works off of pull requests and i want to ensure that there is not much merge issues.  How can i pull down the changes from develop into my local branch and fix any merge conflicts. After that i'll push the branch up to the remote and do a pull request. </p>
  
  <p>i was thinking to do <code>git rebase</code>. i think if i do rebase it will change the history of my local branch and automatically merge the local branch into develop right ?  but could also just do from my local branch <code>git pull origin develop</code> and fix the conflicts this way ? is it safe. </p>