Contributing on GitLab#

Objectives📍

  • fork

  • merge requests

  • gitlab for project management

  • git LFS

Forking and merge requests#

Sometimes you want to contribute to a project on gitlab but you don’t have write access. This is usually the case if you are not added as a member to the project. Even if the project is public, you cannot contribute to it without opening a merge request. The same is true for your own repos: you can make them public, people can clone them but they cannot change something on the project without asking you first through a merge request. Like mentioned before, even if you are a member of the project and work together with your collaborators, it is always a good idea to work with merge requests to foster communication and avoid a ton of conflicts.

To open a merge request on a repo where you don’t have write access to, you first need to fork this project. You’ll find the fork button on the upper right in the respective gitlab repo. Forking a project means copying a remote repository from another user as a remote repository under your username.

Task 15

  • work with your partner from the previous task again

  • owner forks project of developer

  • owner clones the forked project

  • owner makes change and pushes it back to the forked project

  • owner opens a merge request on developers project

    • go to the developers repo

    • click on merge requests on the left sidebar

    • select your (owners) repo and branch as source branch and the developers repo and branch as target branch _ developer should see a new merge request on their repo. Inspect it and merge it.

merge request

If developer also wants to try it, you can fork the project of someone else in this group and go through the owners steps from above.

GitLab for project managing#

GitLab is actually more than just a code development platform. It has so many additional functions. Under the section Plan you can manage tasks (issues and issue board), keep track of important milestones and assign issues to milestones. You can write a comprehensive wiki to store important information about the project (e.g., links to other important resources such as data repo, document meeting minutes etc.).

You can also do automated testing of your code (continuous integration/CI), build packages or container for apps and deploy them to e.g., docker. On Friday we will learn about CI and how to do it on GitLab.

It allows you to do a bunch of other stuff which is related to project analytics which is mostly used in industry and exceeds the goals of this workshop. But don’t hesitate to check it out!

Git LFS#

Note: Text and images retrieved from atlassian.com

Git is a distributed version control system, meaning the entire history of the repository is transferred to the client during the cloning process. For projects containing large files, particularly large files that are modified regularly, this initial clone can take a huge amount of time, as every version of every file has to be downloaded by the client. Git LFS (Large File Storage) is a Git extension developed by Atlassian, GitHub, and a few other open source contributors, that reduces the impact of large files in your repository by downloading the relevant versions of them lazily. Specifically, large files are downloaded during the checkout process rather than during cloning or fetching.

Git LFS does this by replacing large files in your repository with tiny pointer files. During normal usage, you’ll never see these pointer files as they are handled automatically by Git LFS:

  1. When you add a file to your repository, Git LFS replaces its contents with a pointer, and stores the file contents in a local Git LFS cache.

git lfs concept

  1. When you push new commits to the server, any Git LFS files referenced by the newly pushed commits are transferred from your local Git LFS cache to the remote Git LFS store tied to your Git repository.

git lfs push

When you checkout a commit that contains Git LFS pointers, they are replaced with files from your local Git LFS cache, or downloaded from the remote Git LFS store.

git lfs checkout

Git LFS is seamless: in your working copy you’ll only see your actual file content. This means you can use Git LFS without changing your existing Git workflow; you simply git checkout, edit, git add, and git commit as normal. git clone and git pull operations will be significantly faster as you only download the versions of large files referenced by commits that you actually check out, rather than every version of the file that ever existed.

To install it you simply need to run git lfs install. And there you go.