Setup

For this assignment, you must use your account on calgary.cs.washington.edu:

ssh [netid]@calgary.cs.washington.edu

From here, change into your cse374 directory by running the following:

cd cse374

Work in your own git repo¶

You should have cloned your own git repo from hw3, hw4, hw5, and hw6. See the “Clone your own git repo” section if you need help. After cloning the repo, change directory to the local copy of your repository: cd cse374-24wi-[uw_net_id].

Make sure your remote configuration is setup correctly by running git remote -v. It should output:

origin  git@gitlab.cs.washington.edu:cse374-24wi-students/cse374-24wi-[uw_net_id].git (fetch)
origin  git@gitlab.cs.washington.edu:cse374-24wi-students/cse374-24wi-[uw_net_id].git (push)
upstream        git@gitlab.cs.washington.edu:cse374-24wi-students/cse374-24wi-hw.git (fetch)
upstream        git@gitlab.cs.washington.edu:cse374-24wi-students/cse374-24wi-hw.git (push)

In this configuration, the origin (default) remote links to your repository where you’ll be pushing your individual submission. The upstream remote points to our repository where you’ll be pulling subsequent homework and bug fixes (more on this below).

Pull starter code from the upstream repo¶

You will need to pull updates from the cse374-24wi-hw repository to get the actual files for hw7, and then upload it.

git config pull.rebase false
git pull upstream hw7 --allow-unrelated-histories --no-edit -X ours
git push

🎉 Congratulations! You have successfully pulled starter code from the cse374-24wi-hw repository into your own repository. Now, you can cd hw7 and start working on hw7!