Re: Git patch won't apply

[John Mandereau]

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?

You might want to try

rm input/new/printing-the-bar-number-for-the-first-measure.ly

before applying.

John