Overview

While you’ve already been using Git in this course, you might need some more advanced features for your project if you are working on a team. Existing experience with these features varies widely, so today is focused on making sure everyone has some comfort with the important functionality.

Basic Learning Objectives

Before class, you should be able to:

  • Explain the difference between the staging area, local repo, and remote repo
  • Use the add, commit, push, and pull commands
  • Explain what a merge conflict is

Advanced Learning Objectives

After class, you should be able to:

  • Identify when a merge conflict will happen
  • Resolve a merge conflict using VSCode and the Terminal

Resources

There are a lot of guides about Git on the web and they vary in quality. The following are a few guides that are on the better quality side:

Checks

Submit answers to the following on Moodle:

  • What causes a merge conflict?
  • How do you resolve a merge conflict?