title: Best practice to commit a bug fix into both master and branch
body: <p>If a fix needs to be committed into both master and another branch (on an remote shared repo), what is the best practice?
  Since we cannot use git merge here because not all the commits in master or branch should go into another, is cherry-pick the best choice?</p>
  
  <p>--</p>
  
  <p>Example:</p>
  
  <p>commit FIX to master</p>
  
  <p>checkout branch</p>
  
  <p>cherry-pick FIX from master and push</p>
  
  <p>--</p>
  
  <p>Does cherry-pick have the same issue as rebase (never rebase if the commit is going to be shared) ?</p>