Rebasing a Git merge commit

Question

Take the following case:

I have some work in a topic branch and now I\'m ready to merge back to master:

* eb3b733 3     [master] [origin/master]
| * b6         


        

Answer 1

• From your merge commit
• Cherry-pick the new change which should be easy
• copy your stuff
• redo the merge and resolve the conflicts by just copying the files from your local copy ;)