This homework will help you get familiar with git and github, tools you'll be using later on in this class and your career. At the end of this exercise, you should have created two branches, created a merge conflict, resolved it, and then pushed the results to your github repository.
YOU SHOULD USE YOUR COMMAND LINE. Do not use the website, GUI, or any other Git interface. This is for your benefit!
You can follow the steps below, but please note that a number of them have been deleted, mostly things like when to use "git add" and "git commit". Simply following these steps verbatim will result in your project becoming an intractable mess.
- Read this: https://towardsdatascience.com/get-git-a-primer-on-git-aa2cd1d9436f
- Create a fork of this repository (there should be a fork button on this page in the upper right).
- Create a file called "answers.txt"
- In answers.txt, paste the following and answer the question:
What is the difference between a merge and a rebase?
- Create a branch called "progress" and switch to it.
- Clear the context of "answers.txt"
- Paste the following into "answers.txt" and answer the question.
What is a remote repository?
- Switch back to "main" and merge the main branch with the progress branch such that both your answers are in order in answers.txt
- Submit a link to your github project.