I just did git am 000* and it worked fine for me, on master. On Sun, 6 Jan 2019 at 01:20, John Beard <john.j.be...@gmail.com> wrote:
> On Sat, Jan 5, 2019 at 4:23 PM Seth Hillbrand <s...@hillbrand.org> wrote: > > > Patch 0002 does not apply cleanly to qa/CMakeLists.txt even after > > applying 0001 > > Hmm, that's odd: I can apply this with "git am 0002....". I'm applying > on top of 69fc301bf. Where are you applying it to? Do you still have > the triangulation test code in your tree? IIRC there is a conflict in > that file. > > Cheers, > > John > > _______________________________________________ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp >
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
