title: Git rebase fails because: Commit xxxx is a merge but no -m option was given
body: <p>I had a feature branch:</p>
  
  <pre><code>feature
  </code></pre>
  
  <p>with lets say 10 commits</p>
  
  <p>then some time ago I started doing experiments on it, but wanted to preserve the current functionality just in case, so I started a new branch:</p>
  
  <pre><code>feature-experiment
  </code></pre>
  
  <p>and then did another 10 commits</p>
  
  <p>today I decided to <code>merge</code> <code>feature-experiment</code> into <code>feature</code> and then I deleted <code>feature-experiment</code>. There were some merge conflicts which I resolved.</p>
  
  <p>then, my 20 commits which were all using the same name and ending in <code>WIP</code> (work in progress), were very ugly, so I decided to</p>
  
  <pre><code>git rebase -p -i HEAD~22
  </code></pre>
  
  <p>I changed <code>pick</code> to <code>s</code> to squash them all into the oldest commit for this feature, but I had some merge conflicts (the same as before). I resolved them and then</p>
  
  <pre><code>git add -A &amp;&amp; git commit
  
  git rebase --continue
  </code></pre>
  
  <p>but now I get the following error:</p>
  
  <pre><code>error: Commit asd123qsd is a merge but no -m     option was given.
  fatal: cherry-pick failed
  Could not pick asd123qsd 
  </code></pre>
  
  <p>This is the last commit (the merge one)</p>
  
  <p>I tried again, but this time I didnt change this particular commit's <code>pick</code> to <code>s</code>, but got the same error.</p>
  
  <p>How can I carry out this dreadful rebase?</p>
  
  <p>I was thinking, as a possible solution, I could I modify the last commit to add -m to it, but how do I do that and what do I do with this -m command? Are there any other options</p>