title: Git : Shall I merge the source branch into the feature branch?
body: <p>At my office we are using git and doing some code review. Coming the time to review my colleague ask me to merge the source branch (master) into my feature branch to be able to see the differences and do the review. I did not really agree because in my mind the feature branch was supposed to contain only the commits of the feature and so not import the master branch changes.</p>
  
  <p>So I would like to know if when creating a long living shared feature branch, shall I merge at any point the source branch into the feature branch or not?</p>
  
  <p>I have seen some explanations when git rerere is enabled where you merge the source branch into the feature one to record the resolution of the potential conflicts then revert the commit's merge.</p>
  
  <p>I would like to know what is the best practice.</p>