title: Cherrypicking versus Rebasing
body: <p>The following is a scenario I commonly face:</p>
  
  <p>You have a set of commits on <code>master</code> or <code>design</code>, that I want to put on top of <code>production</code> branch.</p>
  
  <p>I tend to create a new branch with the base as <code>production</code> cherry-pick these commits on it and merge it to <code>production</code></p>
  
  <p>Then when I merge <code>master</code> to production, I face merge conflicts because even tho the changes are same, but are registered as a different commit because of cherry-pick.</p>
  
  <p>I have found some workarounds to deal with this, all of which are laborious and can be termed "hacks".</p>
  
  <p>Altho' I haven't done too much rebasing, I believe that too creates a new commit hash.</p>
  
  <p>Should I be using rebasing where I am cherrypicking. What other advantages does that have over this.</p>