Julian, I am not sure it will change anything, but can you try after git-bz: git am --abort git am -iu3 /tmp/Bug... (the path it shows you) Sometimes it will work then.