[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 0/5] fixes for w32 and NetPBM
From: |
Eli Zaretskii |
Subject: |
Re: [PATCH v2 0/5] fixes for w32 and NetPBM |
Date: |
Fri, 01 Nov 2013 13:24:45 +0200 |
> Date: Fri, 01 Nov 2013 11:36:31 +0100
> From: Claudio Bley <address@hidden>
> Cc: address@hidden
>
> > 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?
There are no ChangeLog merge conflicts, not with bzr. Bzr resolves
ChangeLog issues automatically.
Anyway, you don't need to send the log entries as diffs, you can just
send them as part of the text portion of your patch. Copy/yank is
simple enough.