7. Branches are linear
Fred performs a check-in:
Wilma tries to also check-in her changes. However this fails and displays the following error dialog:
The problem is that a branch may only diverge on the local working copies on client machines, but not with respect to the check-ins on the server. On the server a branch is always associated with a linear sequence of check-ins.
Wilma selects Update:
which results in:
<
/p>
We see that Fred's edits have been automatically merged into Wilma's local working copy. Wilma still has uncommitted edits (note the asterisk).
Wilma checks in her changes:
Now Fred can perform an update, giving
Fred and Wilma have both updated from the repository and no longer have uncommitted local edits. It follows that their working copies have converged to the same state, and indeed this is the case.