A repository to teach using Git
Each of the below sections has instructions using all the following:
- Command Line
- VSCode
- GitHub Desktop
Note: If you are not comfortable with using a terminal, or command line, it is recommended that you start with one of the other tools.
Refer to the Glossary for some helpful definitions.
Read this document to read about why we're learning about Git.
Read this document to learn more about what Git is.
Read this document to learn more about why using Git is a good idea.
Read this document to learn some basic Git commands and principles.
Read this document to learn more about what branches are and why they're useful.
Read this document to learn more about what merging is and what it is used for.
Read this document to learn more about what a remote is and how to use one.
Read this document to learn about GitHub and some of its features.
Read this document to learn how you can utilize all of the above knowledge to work well with others.
The below are all different exercises you can use to test your Git knowledge.
Let's start with the bread and butter of using Git, creating a commit.
Now that you've made commits to your repository, let's make a branch to keep our next changes separate from others.
Awesome! We've got a branch with our changes on it, but now we need to merge it back to the main branch.
But, what happens when Git doesn't know what to do when you're merging? A merge conflict that we'll have to resolve manually
Let's share our work with the rest of the world by using a remote repository.
Sharing your changes is important. We'll use a Pull Request to let others know that we have changes we'd like to merge into the main branch of the repository.
Finally, let's put all of this together and go from creating an issue to having the changes merged into the main branch.