Re: [Qemu-block] [Qemu-devel] [PULL 00/48] Block layer patches

[Peter Maydell]

On 30 March 2016 at 09:57, Kevin Wolf <address@hidden> wrote:
> Am 29.03.2016 um 21:56 hat Peter Maydell geschrieben:
>> Hi. I'm afraid this doesn't compile:
>> [...]
>> Looks like you've also been hit by commit da34e65cb4025, which
>> means you now need to explicitly include qapi/error.h if you need it.
>
> Ok, I can (and will, unless you tell me not to) send a v2 of the pull
> request; but generally speaking, wouldn't it make more sense and be
> easier for everyone involved (including yourself) if such merge
> conflicts where you know exactly what trivial fixup needs to be done
> were handled in the merge commit?

Sometimes, yes, but I often prefer not to for two reasons:
(1) I often have a big queue of merges to process and time
spent by me trying to by-hand fix up bad merges is time not
spent processing somebody else's merge
(2) I may be able to get the merge to compile but my testing
process for the affected code is likely to be much less
comprehensive than the submaintainer's

So mostly I reserve fixes during the merge for trivial
textual-only conflicts.

thanks
-- PMM