Scribd
Upload
88 views

Lab 01 Version Control PDF

This document provides instructions for a group software engineering exercise using Git and GitHub. Students are divided into groups of 4 and each member joins a shared GitHub repository. Each student adds their name to the repository in a text file. Conflicts then arise when each member tries to modify a shared "team.txt" file to add their name. Students must resolve the conflicts by pulling changes, merging files, and pushing commits with messages explaining their changes. Finally, groups submit their GitHub link and names to the instructor for evaluation and grading of their collaboration through the version control process.

Uploaded by

فراس فارس صفاقس
Copyright
© © All Rights Reserved
Available Formats
Download as PDF, TXT or read online on Scribd
88 views

Lab 01 Version Control PDF

This document provides instructions for a group software engineering exercise using Git and GitHub. Students are divided into groups of 4 and each member joins a shared GitHub repository. Each student adds their name to the repository in a text file. Conflicts then arise when each member tries to modify a shared "team.txt" file to add their name. Students must resolve the conflicts by pulling changes, merging files, and pushing commits with messages explaining their changes. Finally, groups submit their GitHub link and names to the instructor for evaluation and grading of their collaboration through the version control process.

Uploaded by

فراس فارس صفاقس
Copyright
© © All Rights Reserved
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 7

Source Control (Git and GitHub)

SEG2105 - Introduction to Software Engineering – Fall 2020

Lab Exercise

Faculty of Engineering | Faculté de Génie

uOttawa.ca
Exercise: Coordinating Access
• Students are to form groups of 4.

• Part 1
– Use the following link to join our GitHub classroom.
https://classroom.github.com/g/pp663HZs
– One of the members of the team creates the team, the other (3)
members join it.
Exercise: Coordinating Access

• Part 1 (2)

– The members of the group will then clone the repository to their local
machines and create a text file with their first name. e.g.:
"miguelgarzon.txt"
– Each student must then commit and push their changes to the
repository
• Remember to pull changes from the repository before pushing your
commit.
– At the end of Part 1, the remote repository should have 4 files, each
with the name of a team member. There shouldn’t be any conflicts in the
repository at this point.
Exercise: Resolving Conflicts

• Part 2
– Each member of the group will attempt to modify the same file.
– Each student must create a file named “team.txt” and write their first
name in this file. At the end of the exercise, "team.txt" contains the
names of the 4 students.
– Each student must commit and attempt to push their file.
• 3 students won't be able to push without resolving conflict. After
pulling remote changes, you will get a “conflict warning”. Look into
the file and you will see that the changes to the file proposed by the
local and remote commits. Fix the file and add it to the staging area.
• Push your changes (see slide 6 for example of file with conflict)

Students will be evaluated via their GitHub repository commit history


and the status of their files. Remember to write messages that make
sense and explain what you did in your commits.
Final Step

• To facilitate the grading task, create a Group


in BS with the four members of the team and
submit a message with the following:
– Your GitHub repository link
– Your names.

The submission link can be found at:


Extra Note: Merging vs Rebasing – Graphical Example
THANK YOU

You might also like