git-p4 submit fails with patch does not apply
问题 When I do the following: $ git-p4 submit I wind up with the following error trace: error: patch failed: foo/bar/blah.h:1 error: foo/bar/blah.h: patch does not apply Unfortunately applying the change failed! What do you want to do? [s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) How can I recover from this situation and make a successful submission? FWIW, our P4 server is configured to use keyword expansion (filetype = text+k) and