Re: [PATCH v2 0/5] fixes for w32 and NetPBM

[Claudio Bley <claudio.bley@googlemail.com>]

At Fri, 01 Nov 2013 11:12:24 +0200,
Eli Zaretskii wrote:
> 
> > Date: Wed, 30 Oct 2013 13:42:50 +0100
> > From: Claudio Bley <claudio.bley@googlemail.com>
> > 
> > This is version 2 of
> > http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html
> > 
> > Changes since v1:
> > 
> >  - reworded commit message of patch #1 stating that different major
> >    versions of jpeglib are indeed binary incompatible
> > 
> >  - simplified logic of patch #2, using the name libpngXY.dll and
> >    libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request
> 
> Thanks, installed on your behalf.

Thank you!

> In the future, please also provide ChangeLog entries for your
> changes.  (I wrote them this time.)

OK, will do. But, I'm curious, how do you cope with the merge
conflicts popping up for each patch? Do you resolve them manually each
time?
-- 
Claudio