How do I use git rebase -i after git merge without messing things up?

Question

I have the following situation: I made some commits to my local repository, and then a huge merge of another branch (~150 commits) into the master - it had a lot of conflict

Answer 1

I've made a script to do this here. See the open issues for known limitations.

You'll need to first install rerere-train.sh onto your PATH. On Fedora this can be done with:

    install "$(rpm -ql git|grep '/rerere-train.sh$')" ~/bin