Updated the "gitHowTo.txt" file with description of how
to handle stashing your stuff in order to pull --rebase.
Also added a short description of how to handle merge
conflicts.