[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] diff across branches
|
From: |
Daniel Carosone |
|
Subject: |
Re: [Monotone-devel] diff across branches |
|
Date: |
Wed, 30 Aug 2006 08:29:28 +1000 |
|
User-agent: |
Mutt/1.5.13 (2006-08-11) |
On Wed, Aug 30, 2006 at 08:09:11AM +1000, Daniel Carosone wrote:
> both of the branches (to prevent a conflict), then merge as before,
> and then apply any changes along the branch from the previous file to
> reproduce the current content.
Actually, reverse the order of the last two steps: after adding at the
ancestor, modify the file content to match the current heads of each
branch, and then merge with the branch heads that drop the older files.
--
Dan.
pgpajPrCmD_Br.pgp
Description: PGP signature