[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: <<< conflict markers

From: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: <<< conflict markers
Date: Wed, 14 Apr 2004 18:26:36 -0400
User-agent: Mozilla Thunderbird 0.5 (X11/20040309)

Jan Hudec wrote:
But it would have the same effect as `tla star-merge --three-way', so it
would be a bit redundant.

But star-merge is far less efficient for this.

replay and update would equivalent with three-way merge.

Update is a three-way merge. It applies the delta between the tree revision and your current changes to the latest version in the archive, and you get the results in your project tree.


Aaron Bentley
Director of Technology
Panometrics, Inc.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]