fastforward failing when the diff shows a non-model file has change

e.g If the license file changed, it will break