TFW you lose confidence in git's automerge capabilities and resorting to 'git fetch'/'git merge'.