Re: linux-next: tip-core merge conflict

Stephen Rothwell
2008-06-12T14:34:38Z

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Hi Ingo,

On Thu, 12 Jun 2008 16:10:22 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> i think it might be a communications issue - as conflicts are not a
> problem per se, they are just a complication that you resolve.
>
> So it might make sense to change the subject line of your merge
> resolution mails from:
>
> linux-next: tip-core merge conflict
>
> to:
>
> linux-next: manual merge of tip-core
>
> that way people still stay informed about interactions between trees
> (and can reduce them when they are avoidable, and can check the result
> as well since it was done manually), but dont see it as some sort of
> failure that needs to be 'resolved' via dropping patches.

Thanks for the suggestion, I like it. Look forward to calmer subjects
from now on. :-)