[MERGE] Conflict handling docs

[James Westby]

On (24/07/07 17:25), Aaron Bentley wrote:
> >> +Sometimes Bazaar will attempt to create a file whose parent directory is not
> >> +versioned.  This happens when the directory has been deleted in the target,
> >> +but has a new child in the source, or vice versa.  In this situation, Bazaar
> >> +will version the parent directory as well.  You may rename either file, if you
> > 
> > What does "either file" refer to?
> 
> Either the directory or the file.

Ok, but everywhere else you have been explicit about what will be seen
in the working tree (THIS etc.). Here that is implicit, and not exactly
clear to me. I can only see one file involved in the conflict, two if
you count the directory, but even then it's not clear how renaming would
solve this conflict. Is this one of the cases where you get a "file" and
"file.moved" or similar?

Apart from that +1, or whatever the vote is in the new system for "go
ahead and merge it, perhaps considering these comments first". I think
this is good clear documentation that could be very valuable to some
people, and has taught me some things as well.

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256