duplicate commits after git rebase -i HEAD~10

From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Dec 3, 2010, 15:04 UTC
Message-ID: <AANLkTi=W9MyCuOuk49AtCxR7nTa5xkddY_2HkhOvQip-@mail.gmail.com>

Hi,

  I am trying to understand what I did wrong in my git rebase and
eventually I would like to repair my mistakes. Basically after a git
rebase, I ended up with duplicate *identical* commits. One was on the
master branch and one was on a local branch which was merge to master.

$ git log --graph
...
| * commit 662be6a57a6a64840ba0f1b29d422ab6b129ff04
| | Author:
| | Date:   Fri Dec 3 15:27:10 2010 +0100
| |
| |     BUG: 122 Work toward a better framework for Java wrapping testing
| |
* | commit 1f639b9fd6c04eb48a69d84749bb30d7dd816382
| | Author:
| | Date:   Fri Dec 3 15:42:16 2010 +0100
| |
| |     BUG: 122 Work toward a better framework for Java wrapping testing
| |

Is there a way to properly merge identical commit back together ?

Thanks !

-- 
Mathieu