title: Cherry pick a range of commits with merge commits
body: <p>I need to cherry pick a range of commits, but it fails because in this range I have merge of some branches. 
  Is it possible to do it without conflicts?</p>