exercise-2

Exercise-2

In this exercise, you'll practice creating a repository, adding collaborators, and resolving any conflicts that may arise. You should work in groups of two or more.

Set up

To set up the repository, take the following steps:

• Person 1 should create a new repository on GitHub with a README.md file.
• Person 1 should add Person 2 as a collaborator to the repository on GitHub
• Person 1 and Person 2 should both clone the repository to their machine

Simultaneous Contribution (to create conflict)

Here, we'll see how multiple people contributing to the same project can create conflicts when integrating changes.

• Person 1 should edit the README.md file by adding a line (i.e., line #2)that says My favorite candy is
• Person 1 should then add and commit those changes, then push those changes up to GitHub
• Person 2 should then edit the README.md file by adding a line (i.e., line #2)that says My favorite candy is
• Person 2 should then add and commit their changes, and attempt pushing up to GitHub

At this point, GitHub should prevent Person 2 from pushing because they are not working on top of the most recent commit to the project.

Rebasing

To allow Person 2 to replay their changes on top of the most recent version of the project, they should rebase the changes from the remote:

• Person 2 should pull and rebase changes from GitHub (i.e., git pull --rebase origin master). This should not work smoothly because Person 1 and Person 2 edited the same line of the same file.
• Person 2 will then have to open up the README.md file to make changes manually to the file
• After making the file look exactly how the want, Person 2 should add their changes to the rebase (i.e., git add .) and then continue (complete) the rebase (git rebase --continue)
• Person 2 should now be able to push their (integrated) changes up to GitHub.