![]() ![]() $ git apply -ignore-whitespace -inaccurate-eof /c/temp/git/dif_origin.patchĬ:/temp/git/dif_origin.patch:9: trailing whitespace.Ĭ:/temp/git/dif_origin.patch:18: trailing whitespace.Ĭ:/temp/git/dif_origin.patch:29: trailing whitespace.Ĭ:/temp/git/dif_origin.patch:30: trailing whitespace.Įrror: patch failed: tr/test_report.txt:2Įrror: tr/test_report.txt: patch does not apply Now, as suggested by Charles - if i try the git diff, i get the error as below. $ git am -3 -ignore-whitespace /c/temp/git/format_since_origin.patch ![]() To restore the original branch and stop patching run "git am -abort".Īny idea why this patch is failing? Or is my method totally wrong? Update: If you would prefer to skip this patch, instead run "git am -skip". When you have resolved this problem run "git am -resolved". It does not apply to blobs recorded in its index. Using index info to reconstruct a base tree. $ git am -3 /c/temp/git/format_since_origin.patch I am unable to apply the patch created from the shallow clone above. * 8a1ce1e (HEAD, origin/master, master) from full clone I want to apply this patch in another clone, which is a full clone. * 7347896 (grafted) changes for release 2 * 8a1ce1e (origin/master, origin/HEAD) from full clone I have a shallow clone, on which i made three commits. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |