Nice tutorial.

In your diagram, I think the direction of the arrows for pull and merge are reversed.
Merge is for when you want to "commit" from the branch directory to the main directory.