Simple clarification

[hamid-nazari]

• [ x ] I provide my work under the project license.
• [ x ] I grant such license of my work as is required for the purposes of future print editions to Ben Straub and Scott Chacon.

Changes

I think and then would be better changed to and when later or and when (later) to better clarify the purpose (I got confused the first time).

...
Then you need to tell Git what to do if you have made changes and when later git submodule update --remote pulls in new work from upstream.

Context

My change is on Git Tools/Submodules/Working on a Project with Submodules/Working on a Submodule