[REVIEW] Ch4. Branching and Merging - Advanced Merging

[Ben Collins-Sussman]

On Thu, Jun 12, 2008 at 11:14 PM, C. Michael Pilato
<cmpilato at red-bean.com> wrote:

> To that end, a sidebar about some of the things folks might see (such as
> copy/move creating mergeinfo, mergeinfo appearing on files that weren't
> really touched, a glossed-over explanation of elision) would be a great
> thing -- it helps them know they aren't seeing bugs or using the tool
> incorrectly.  And if the sidebar also helps folks learn best-practices for
> avoiding the nastier situations, double bonus!

Mike, maybe you want to write this sidebar?  Honestly, because I've
not been working on merge-tracking, I don't *know* what the common
quirks/problems are.