Post #3964400

Zero days since I messed up rebase by using `#git commit --amend` and missing that I was suppose to just `git commit` because it stopped on a merge conflict rather than my "edit".