the-missing-e
August 16
git rebase
-s recursive
saved me today. try it if your merge is too conflicted.
