sean finney wrote:
> On Fri, May 06, 2011 at 03:19:09AM -0500, Jonathan Nieder wrote:
>> In the general case, the right merge result may depend on the content
>> of other files (for example, if the user renamed a file so the new
>> pristine version should be renamed, too). Luckily I don't think t
On Fri, May 06, 2011 at 03:19:09AM -0500, Jonathan Nieder wrote:
> Is "diff3 -m" the state of the art for this? Well, it will do to
> start. In the long term maybe some people will want to use some other
> tool to perform the merge, like RCS "merge" or something Config::Model
> based.
I think a
From: Sean Finney
Date: Mon, 14 Dec 2009 08:27:36 +0100
The conflict resolution prompt has been updated with a new option for
automatic merging:
M : attempt to automatically merge the differences
This functions by performing a 3-way diff using the new conffile, the
currently-insta
On Sun, Feb 07, 2010 at 08:51:27PM +0100, Guillem Jover wrote:
> > On a successful merge, the merge output replaces the conffile, and dpkg
> > continues as if the admin had selected to keep the old conffile. On merge
> > failure the admin is informed of the failure and the the conflict prompt
> > i
Hi!
On Mon, 2009-12-14 at 08:27:36 +0100, Sean Finney wrote:
> The conflict resolution prompt has been updated with a new option for
> automatic merging:
>
> M : attempt to automatically merge the differences
>
> This functions by performing a 3-way diff using the new conffile, the
The conflict resolution prompt has been updated with a new option for
automatic merging:
M : attempt to automatically merge the differences
This functions by performing a 3-way diff using the new conffile, the
currently-installed conffile, and the pristine version of the conffile
fr
6 matches
Mail list logo
