[MERGE] help criss-cross should suggest using remerge

[Martin Pool]

On undefined, Aaron Bentley <aaron at aaronbentley.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Stefan Monnier wrote:
>  >> That is false.  Remerge reuses the foo.THIS file, not the last-committed
>  >> version of foo, so it preserves changes already made to the working file.
>  >
>  > What about changes made to the working file (i.e. the file that
>  > contains the merge with conflict markers)?
>
>  Changes made before merging will be present in the .THIS file.  Changes
>  made after merging will be discarded.

That's what I was trying to communicate: if you have already resolved
some conflicts manually or made other changes to the working copy,
remerge will discard that work.

Anyhow here is take #2.

-- 
Martin <http://launchpad.net/~mbp/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20080402-criss-cross-help.diff
Type: text/x-diff
Size: 3535 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080403/6931293b/attachment.bin