title: How do I backport a commit in git?
body: <p>So, I have a maintenance branch and a master branch in my project. If I make a commit in the maintenance branch and want to merge it forward to the master branch, that's easy:</p>
  
  <pre><code>git checkout master; git merge maintenance
  </code></pre>
  
  <p>But if I want to go the other way around, i.e. apply a commit made to master back to my maintenance branch, how do I do that? Is this considered cherry-picking? Will it cause problems or conflicts if I merge the maintenance branch forward again?</p>