|
From: | John Mandereau |
Subject: | Re: Git patch won't apply |
Date: | Sat, 10 Jan 2009 18:54:07 +0100 |
User-agent: | Thunderbird 2.0.0.19 (X11/20090105) |
Carl D. Sorensen a écrit :fatal: git apply: bad git-diff - expected /dev/null on line 46 Patch failed at 0001. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Any other ideas?
Are "diff --git a/... b/..." lines broken in the patch you actually tried to apply? They should not be broken, I guess.
John
[Prev in Thread] | Current Thread | [Next in Thread] |