RE: How to combine two incompatible patches?

Hello.


> but both need to patch tcpserver.c file, so the second patch always
> fail
> when I try apply it.
> 
> I want to know if exist an automatic method for combine two diff files
> (patch) or it's mandatory to do this process by hand.

Not that i know it. 
In cases like these I tend to do it manual.

But maybe you find something on
http://cyberelk.net/tim/software/patchutils/
that may help you.

Greets
Phil.