title: git merge or rebase for stale branch?
body: <p>I've got the master branch and another branch let's say B which is a fork of the master. 
  The B branch was experimental and underwent a lot of modifications but was left stale for a year. 
  Master branch has moved a lot forward during that year with countless commits.</p>
  
  <p>But now the situation wants the B branch merged into the master one.
  Which strategy is best in this situation, a git merge or rebase ?</p>