kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Carsten,

I'm still getting the following git error when applying patch 1:

Applying: Adding license information for demo files
Using index info to reconstruct a base tree...
error: patch failed: LICENSE.README:15
error: LICENSE.README: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 Adding license information for demo files
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Any ideas?

Cheers,

Wayne

On 3/27/2019 12:36 PM, Carsten Schoenert wrote:
> Hello Wayne,
> 
> Am 27.03.19 um 16:34 schrieb Wayne Stambaugh:
>> Hey Carsten,
>>
>> I tried merging your patches and patch 1 does not merge cleanly.  Would
>> you please rebase patch 1 so I can get it merged?
> 
> rebased and re-added.
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>