How do I include two patches for the same file?

[Charles Swiger]

On Jun 28, 2006, at 1:40 PM, Paul Schmehl wrote:
> I'm the maintainer for security/sancp.
>
> Recently a new patch was released that patches the decode.cc file.   
> A previous, still valid, patch, *also* patches the decode.cc file.   
> If I include both patches, the make fails with an error about  
> decode.cc

You ought to merge the patches into a single set of changes which is  
consistent.

-- 
-Chuck