exercise-1

Exercise-1

In this exercise, you'll practice creating a repository, adding collaborators, and integrating the work of others through rebasing. 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 should then create two issues on GitHub: edit README.md and create exercise.R
• Person 1 and Person 2 should both clone the repository to their machine

Simultaneous Contribution

Here, we'll see how multiple people contributing to the same project can prevent individuals from pushing to GitHub:

• Person 1 should edit the README.md file by adding a line that describes the project
• Person 1 should then add and commit those changes, then push those changes up to GitHub (make sure to close issue 1 with a commit message)
• Person 2 should then create a new file called exercise.R, and add a line of code to that file (whatever you want: x <- 1).
• Person 2 should then add and commit their changes, and attempt pushing up to GitHub (make sure to close issue 2 with a commit message)

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 work smoothly because Person 1 and Person 2 did not edit the same line of the same file
• Person 2 should now be able to push their (integrated) changes up to GitHub.

This exercise is a simple example of using rebasing without conflict. To practice encountering conflict, see exercise-2.