title: Ignore reverted changes during merge
body: <p>My commit-tree described below:</p>
  
  <pre><code>--(+A)--(+B)-+-(-B)--(+E)--(master: AE)
                \
                 +--(+C)--(+D)--(branch: ABCD)
  </code></pre>
  
  <p>Some changes have been reverted in <strong>master</strong>. We need to merge the changes from the <strong>branch</strong> to <strong>master</strong> reverting reverted commit.</p>
  
  <p>Does one-step way exists? Or only one way is <em>cherry-pick</em> (B) to <strong>master</strong> before merging the <strong>branch</strong>?</p>
  
  <p>P.S. Final <strong>master</strong> must look like: (ABCDE) - order is not important</p>