Learn what git is and how it can help you in your development workflow.
Learn what a merge conflict is and how to resolve it.