I made a merge of a long lived branch and it took me time to complete the merge because of the conflicts resolution.
I found out that I cannot publish my work with git-svn
: git svn rebase
will rebase all the commits of the merged branch instead of submitting one single merge commit. I discovered git merge --squash
a bit too late...
Is it possible to change (rebase interractive ?) the merge commit into a "squash merge" commit without loosing all the conflicts resolution work already done (i.e. without triggering a new merge as I had not enabled the rerere
tool) ?