Skip to content

Commit dc31edb

Browse files
committed
Update hw4 with new instructions
1 parent 9c4933a commit dc31edb

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

assignments/04-vcs-constructive.md

+20-21
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
---
33
# Homework 4: VCS, Constructive
44

5-
## Before you start
6-
7-
Please make a private post on Piazza with your GitHub username. If you do not
8-
already have an account there, please make one. You will not be able to submit
9-
your work until you do this (and then wait for the course staff to add you to
10-
the "classroom"). Please do this early.
11-
125
## Tracking changes with Git: maintainer for a day
136

147
You co-maintain a software project with your mustachioed friend Tommaso. You
@@ -26,9 +19,10 @@ instructions on how to submit your answers to such questions.
2619
Expect to make good use of `git reflog` in this assignment as you make errors.
2720

2821
Start by cloning the initial repository from
29-
`/comp/50ISDT/vcs2-constructive.git`. We suggest you work on the homework
30-
server, but you are also free to work on a personal computer (make sure you
31-
have `clang-format` installed if so).
22+
`/comp/50ISDT/vcs2-constructive.git` (you may run into a warning about it not
23+
being a "safe directory"; run the suggested command) . We suggest you work on
24+
the homework server, but you are also free to work on a personal computer (make
25+
sure you have `clang-format` installed if so).
3226

3327
1. A number of the following questions ask you to tell us what commands you
3428
used. Put your answers in the `answers.txt` file in the `answers` branch.
@@ -71,9 +65,10 @@ have `clang-format` installed if so).
7165
`add-new-operators` branch. Unlike Dr. Garbarini, his commits are
7266
masterfully documented, and you want to add them to `main` as is. But you
7367
notice that the commit titled "Support modulo operator" has some formatting
74-
errors. You can run `clang-format -i` to automatically fix those errors, but
75-
you want to include the fix as part of the original commit instead of
76-
putting it in a separate one.
68+
errors. You can run `clang-format -i` to automatically fix those errors
69+
(if you don't have this installed, do it manually), but you want to include
70+
the fix as part of the original commit instead of putting it in a separate
71+
one.
7772
1. **Change the `add-new-operators` branch to point to an updated version of
7873
the same set of commits (with matching commit messages, titles, and
7974
diffs) with fixed formatting in the problematic change. Tell us how you
@@ -107,14 +102,18 @@ have `clang-format` installed if so).
107102

108103
## Submitting your work
109104

110-
To submit, first join our [GitHub Classroom
111-
instance](https://classroom.github.com/a/GJz9jQnu). You will need a GitHub
112-
account to do this. Once you've joined, you should be able to find yourself on
113-
the class roster, after which you will see a repository belonging to you for
114-
the "vcs-constructive" assignment. Add this repository as a remote to the local
115-
repository where you've been working, then push your `main` and `answers`
116-
branches to that remote. If you do this correctly, you'll see both branches
117-
shown in GitHub's web UI.
105+
Make sure your Git repository is somewhere in your home directory on the
106+
homework server. Make sure it has both a `main` and an `answers` branch.
107+
108+
Make a private post on Piazza telling the course staff what the absolute path
109+
to this directory is. We will clone from this location.
110+
111+
Do not modify this folder after the due date has passed or it will be
112+
considered late.
113+
114+
Do not attempt to read other students' home directories. The course staff
115+
monitors activity on the homework server and academic integrity violations will
116+
be rewarded with no points and a report to the dean.
118117

119118
## Notes on being an open source maintainer
120119

0 commit comments

Comments
 (0)