aliklemencic/summerlab-git-2022

Materials for Summerlab 2022 Git On-Ramp Workshop

Materials for the DSI Summerlab 2022 Git Workshops

0. Set Up

1. Create a GitHub account
2. Install Git
3. Add an SSH key to GitHub account

1. Explore the Repo

2. Submit A PR

3. Good Practices

4. Merge Conflicts

We're going to fabricate a merge conflict so you can practice how to resolve merge conflicts when they (inevitably) show up.

1. Create a new file, name it whatever you want
2. Add something to that file
3. Create a new branch name that branch whatever you want
4. Create a new file with the same name as the file you created in step 1
5. Add something to that second new file, make sure it's different from what you added in step 2
6. Checkout your main branch
7. run `git merge <name of branch created in step 3>`
8. You should get a merge conflict
9. Resolve the conflict