03_git (2/10/22)

[stemlock]

• Need to double check and confirm instructions work for DataHub (some participants had issues with access errors when trying to push to remote)
• Some users did not have their global configs set up. We should include instructions or a link to do that like this
• Add some information about pull requests vs just merging code
• Add an example of resolving a merge conflict