Session 7: Collaboration on GitHub / GitLab

Track, organize and share your work: An introduction to Git for research

Course at Max Planck Institute for Human Development

Slides | Source

License: CC BY 4.0 DOI

Dr. Lennart Wittkuhn
lennart.wittkuhn@tutanota.com

15:00

1 Last session: Integration with GitHub / GitLab

Last session: Learning objectives

After the last session, you should now be able to answer the following questions / do the following:

💡 You can create a remote repository.
💡 You can connect your local Git repository to a remote repository service like GitHub or GitLab.
💡 You can pull and push changes to and from a remote repository.
💡 You can clone a repository from a remote repository.

Last session: Cheatsheet

Command Description
git remote Manages remote repositories
git clone Creates a local copy of a repository
git pull Fetches and merges the latest changes from a remote repository into the current branch
git fetch Updates remote tracking branches
git push Uploads local commits to a remote repository

Last session: recipes project

At the end of this session, you should have accomplished the following:

  1. You created a GitHub account.
  2. You connected your GitHub account to your local Git using SSH.
  3. You created a new private(!) GitHub repository.
  4. You uploaded (i.e., “pushed”) the default branch of your recipes repository to GitHub.

Collaboration Option 1:

  1. You invited a partner from the course as a collaborator to your recipes on GitHub.
  2. You collaborated on a shared project by adding and committing changes to your partner’s repository.

Collaboration Option 2:

  1. You clone your own repository to a different location on your computer.
  2. Stage and commit changes in the repository in this new location.
  3. Push the changes to GitHub and pull them in the original repository location on your computer.

Optional:

  1. You created a short README.md file in your repository.

Please keep the recipes folder! We will continue to use it in the following sessions.

2 This session: Collaboration on GitHub / GitLab

This session: Collaboration on GitHub / GitLab

Image from Techdobz

This session: Forking & Pull Requests

Link to Pull Request

This session: Issues

Link to Issue

Reading

“GitHub - Advanced” and “Issues”

Learning objectives

Remotes - Advanced

💡 You know the purpose and components of a Pull Request.
💡 You know how to collaborate using the popular workflow strategy GitHub flow.
💡 You know the purpose and components of a README file.
💡 You can fork a repository.
💡 You can create a Pull Request from a forked repository.
💡 You can protect your main branch.

Issues

💡 You understand the purpose of GitHub Issues.
💡 You can create and manage Issues.
💡 You can reference an Issue in another issue.
💡 You can close an Issue with a commit or pull request.

Cheatsheet

Command Description
git remote Manages remote repositories
git clone Creates a local copy of a repository
git pull Fetches and merges the latest changes from a remote repository into the current branch
git fetch Updates remote tracking branches
git push Uploads local commits to a remote repository

GitHub Flow

Image from Sebass van Boxel

Tasks

In this session, you will work on the following tasks:

  1. Reading: Read the chapter(s) “GitHub - Advanced” and “Issues” in the Version Control Book.
  2. Implementation: Try out the commands in the chapter.
  3. Exercises: Work on the exercises for the recipes project.
  4. Quiz: Test your knowledge with the quiz.

As always:

  1. Try out the commands of this session and play around with them.
  2. Check whether you have achieved the learning objectives.
  3. Ask questions!
  4. Let’s git started!

recipes project

At the end of this session, you should have accomplished the following:

  1. You forked a public / internal recipes repository of another course participant.
  2. You opened an Issue in another repository.
  3. You created a pull request with changes that “fix” the Issue you opened.

Please keep the recipes folder! We will continue to use it in the following sessions.

Exercises

“Public” collaboration with pull requests (using a fork and GitHub Flow)

  1. Find out what forking is.
  2. Fork the project repository of the course instructor or another course participant (ideally, someone who is not your collaborator from the previous exercise).
  3. Create an Issue in your new collaborator’s repository, indicating an entry that you think is still missing in their repository.
  4. Repeat the steps from the exercise on collaboration with remote repositories using the forked repository:
    1. Clone the forked repository to a sensible location on your computer.
    2. Create a new branch and make one or multiple commits “fixing” the Issue that you opened. If available, follow the contributing guide of your collaborator’s repository.
    3. Push your changes to the remote repository.
    4. Create a pull/merge request with your changes (hint: from the forked to the original repository) and refer to the Issue in your pull/merge request.

Use Lennart’s recipes repository. Find out about the contributing guidelines in Lennart’s repo and follow them when creating a new recipe.

Reviewing pull requests

  1. View any pull requests that are created in your recipes repository.
  2. Review the changes made by the contributor in the pull request.
  3. If needed, discuss additional changes with the contributor in the pull request.
  4. Close the pull request by merging the proposed changes.

Solutions

  1. Forking is a process where you create a copy of someone else’s repository under your own account. It allows you to freely experiment with changes without affecting the original project.
  2. To fork the project repository of another course participant: (1) Go to the GitHub repository you want to fork. (2) Click the Fork button at the top-right corner of the repository page. (3) Select your GitHub account to fork the repository.
  3. Create an Issue, suggesting a missing entry: (1) Go to the Issues tab of your partner’s repository on GitHub. (2) Click New issue. Provide a title and description for the Issue, suggesting a missing entry. (3) Click Submit new issue.
  4. Clone the forked repository to a sensible location on your computer.
Code
git clone https://github.com/your-username/forked-repo-name.git /path/to/your/forked/directory
cd /path/to/your/forked/directory
  1. Create a new branch and create one or multiple commits “fixing” the Issue that you opened.
Code
git checkout -b issue-fix-branch
echo "New entry" >> project.txt
git add project.txt
git commit -m "Add new entry to fix #1"
  1. Push your changes to the remote repository:
Code
git push origin issue-fix-branch

  1. Create a pull request with your changes (from the forked to the original repo) and refer to the issue in your pull request:

    1. Go to your forked repository in your browser.
    2. Click the Compare & pull request button.
    3. Ensure that the base repository is the original and the base branch is main.
    4. Provide a title and description for your pull request.
    5. Refer to the issue by adding Fixes #issue-number in the description.
    6. Click Create pull request.
    7. Review any pull requests in your repository.

Version Control Course