- Create a new repository locally on your machine.
- Create a new Github repository. Name it whatever you want.
- Connect your local repo to the Github repo.
- Optional: rename the default branch from master to main.
- Make a new file called
favorites.txt
Leave it empty. Make your first commit on themain
branch. - Push up your
main
branch to Github! Make sure you see your emptyfavorites.txt
file on Github. - Next, create two branches:
foods
andmovies
- Switch to the
foods
branch. Add three (or more) of your favorite foods to thefavorites.txt
file. Add and commit your changes on thefoods
branch. - Switch to the
movies
branch and add three or more of your favorite movies to thefavorites.txt
file. Add and commit your changes on the movies branch. - Push up your
foods
branch to Github. Make sure you see it on Github! - Push up your
movies
branch to Github. Make sure you see it on Github! - Merge the
foods
branch into themain
branch. Then merge themovies
branch into themain
branch. If necessary, resolve conflicts so that you end up with your favorite foods and favorite movies in the samefavorites.txt
file. - Push up the latest work on your
main
branch to Github.
Link of notion page for this exercise.