Hey guys,
Feel free to follow the repo or to check it out if you're having difficulty with any parts of the assignments. Obviously, you can clone it and open it right up in Xcode / Interface Builder if you like (might be useful for the .nib file since the GitHub diff's will be unlikely to be very helpful).
Ed, you had mentioned that you were unsure how to "merge" the first two assignments into a single repository. These are the steps I took to accomplish it.
Assumption: You have each assignment/project in separate git repositories, each underneath the same parent folder (e.g. stanford). I'll refer to them as WhatATool and HelloPoly (naturally).
- Under the stanford/ directory (and side by side with the other two repos), make a new folder that will serve as the parent, e.g. stanford_cs193p.
- $> cd stanford_cs193p && git init
- $> git fetch ../WhatATool master:WhatATool
- $> git fetch ../HelloPoly master:HelloPoly
- $> git merge WhatATool
- $> mkdir WhatATool
- Now, manually 'git mv' all of your files into the new WhatATool/ directory.
- $> git commit -m "Import WhatATool"
- $> git merge HelloPoly
- $> mkdir HelloPoly
- Now, manually 'git mv' all of your files into the new HelloPoly/ directory.
- $> git commit -m "Import HelloPoly"
A few notes:
- Supposedly there's a quicker way to do this with git-filter-branch, but I failed to understand it well enough or get it to work. If anyone knows how to do this, please chime in.
- You may just want to blow away the existing GitHub repo you have and start fresh.
If anyone else wants to share their homework solutions, please respond with a link to your github repo.
-John