Course-upstream to pull new instructions¶

Add course-upstream as a git remote (Only for those continuing with the Assignment)

course-upstream is needed for getting instructions and updates to the assignment. WebCAIS course personnel will distribute the needed files to students via the upstream (i.e., group_template_project). After setting up the system, all students need to do is to pull.

You now have git repositories in course-gitlab.tuni.fi. Initially, your git repository includes files that were present in the repository when you got it and the files you possible have added to it.

In order to get updates, new tests and modifications from the course group repository, you have to add the group_template_project as a remote to your team git repository. This way, you can pull from the remote and get the changes in your repo.

The address of the course group repository: git@course-gitlab.tuni.fi:compcs200-spring2025/group_template_project.git

From this point on, let us call it course-upstream. So, course-upstream is the repository where course-personnel updates the tests, and from which students may pull updates to their own repositories.

After you have successfully cloned your own repository to your own computer and completed the exercises before this one, you can add the course-upstream to your local remotes like so:

Inside your repository give the following command:

git remote add course-upstream git@course-gitlab.tuni.fi:compcs200-spring2025/group_template_project.git

After adding the remote you can view your remotes by

git remote -v

and you can pull from the course-upstream by

git pull course-upstream main

That tells git to pull latest changes from the course-upstream remote and merge them into your local main branch. It will ask you to make a merge commit message. You most likely should not change it in any way from the default message.

In case, the merge does not succeed because of the error message: fatal: refusing to merge unrelated histories

add the option:

git pull course-upstream main --allow-unrelated-histories

Potential merge conflicts are to be solved manually.

Beware that git pull

will still pull from your own repository at course-gitlab.tuni.fi and NOT from the course-upstream.

The workflow will now be:

The course personnel adds tests and/or other files to the course-upstream
You are notified of the updates in Teams and possibly in Plussa News too
You pull from the course-upstream so that your repository is updated to contain latest stuff

A+ presents the exercise submission form here.