4. Merging


In this lab mini-lab we will review how to use Github when collaborating on a repository.

[1] Set Up

In this lab, you will be working in pairs, be sure to clone your group’s repository.

๐Ÿ’ป Download your repository with starter code for your project.
cd ~/desktop/making_with_code/cs10/unit00_networking/
git clone https://github.com/the-isf-academy/lab_merge_group#.git
cd lab_merge_group#

replace # with your group number

๐Ÿ’ป Enter the poetry shell.
poetry shell

[2] Merging

โœ๏ธ Follow the worksheet to work through the merge conflict simulation.

THIS is a great resource if you are unsure how to resolve merge conflicts in the future.

[4] Deliverables

Be sure to hand in the worksheet once complete.