RE: Problem with merging

Thanks Stefan.

I did read most of the links. I didn't know about the FAQ, thanks.
Your statement was key:

"Note that the "tree" being talked about there is not an individual
branch, but all nodes in the repository, including the /trunk directory
and the /branches/feature directory."

Basically in the book in that section tree means repository. But you
cleared it up and the FAQ helped because the fact calls it the
repository tree.

How hard is it to change the book? I know what it means now, but the
next person may get confused. I would bet that someone will eventually
get confused. If it said "repository tree" like the FAQ I would bet it
helps.

John
Received on 2012-09-13 15:26:07 CEST