Announcements

Dear students,

As some of you pointed out, it seems that hw0 and hw1 skeletons indeed have different histories, which causes merge issues. We are sorry for the inconvenience. We suggest two ways to deal with this issue:

1. Preferred option (especially if you haven't started working on the hw1 code already). In your hw1 repo do the following:

$ (hw1) git remote add hw1-sk git@gitlab.epfl.ch:dedis/cs438/2021-HW0-skeleton.git # DEDIS's repo, contains hw1 skeleton atop the hw0 skeleton, so they have the same history
$ (hw1) git fetch hw1-sk
$ (hw1) git checkout hw1-sk/master # you'll get a detached HEAD warning
$ (hw1) git remote add hw0 git@gitlab.epfl.ch:dedis/cs438/students-2021/cs438-2021-hw0-student-xx.git # your hw0 repository
$ (hw1) git fetch hw0
$ (hw1) git merge hw0/grading # your branch in hw0 you want to merge here, recommended that the branch you merge already has the "corrected" test code
$ (hw1) git checkout -b dev2 # creates a new dev2 branch containing your hw0 implementation merged with the skeleton of hw1; it also switches to that branch
$ (hw1) git log # should show you the commits you made in your hw0/grading branch, the commit of the hw1-skeleton and the fixed test commit

2. Hacky option: just copy your code "manually" from the hw0 repo :/

Please let us know if you have any questions.

Best regards,
The CS-438 Team