On Thu, Oct 6, 2011 at 2:00 PM, Dan McGee <dpmc...@gmail.com> wrote: > $ git am -3 -s < /tmp/bacman-code-cleanup.patch > Applying: bacman: small code cleanup > fatal: sha1 information is lacking or useless (contrib/bacman.in). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 bacman: small code cleanup > 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". > > I don't know what was done here, but I can't apply this as-is. > > -Dan >
I will resend all five patches, is it OK?
