We saw in Chapter 8, Classic Branching and Merging that handling renames of files across different branches can be problematic. With streams, these problem situations are detected and handled straight forwardly. For example, renaming a file on one stream and then finding that the equivalent file has been edited on the other stream will show up in your resolve like this:
In the preceding screenshot, we see the combination of a resolve dialog and the revision graph for the files involved. The file
execvms.c was edited on
main, and has been renamed on the
Bruno_dev stream to
The next screenshot clearly shows ...