Description of branching illustration

This figure shows the change and merge conflicts in the Pending Changes pane.