From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sun, 17 Jun 2001 20:41:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sun, 17 Jun 2001 20:41:30 -0400 Received: from geos.coastside.net ([207.213.212.4]:28894 "EHLO geos.coastside.net") by vger.kernel.org with ESMTP id ; Sun, 17 Jun 2001 20:41:16 -0400 Mime-Version: 1.0 Message-Id: In-Reply-To: <20010618023459.C1063@ivan.doma> In-Reply-To: <20010618014547.B1063@ivan.doma> <20010618023459.C1063@ivan.doma> Date: Sun, 17 Jun 2001 17:41:01 -0700 To: linux-kernel@vger.kernel.org From: Jonathan Lundell Subject: Re: any good diff merging utility? Content-Type: text/plain; charset="us-ascii" ; format="flowed" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org At 2:34 AM +0200 2001-06-18, Ivan Vadovic wrote: >Very often the case is that they indeed can be merged automagically. >For example two patches inserting few lines right after the #include >lines. > >patch1: >@@ 10,1 10,2 @@ > #include >+#include <1.h> > >patch2: >@@ 10,1 10,2 @@ > #include >+#include <2.h> > >The patch will fail to patch :-). But there is no real conflict between >the patches. Problem is, you can't tell automatically. Even if the diffs don't conflict physically, it's entirely possible that they conflict logically. -- /Jonathan Lundell.