search

mikeizbicki / ucr-cs100

open source software construction course
Other
485 stars 407 forks source link

Testmerge #1785

Open cbarb005 opened 9 years ago

cbarb005 commented 9 years ago

Very last edits, just cleaned up stuff and added corrected links in the main repository README.

Sorry I couldn't squish it down to just one commit, I didn't want to risk it since the "first" has two parents and I'm honestly not sure how to do that. And sorry there is so many commits, I get finicky sometimes!

There are still a few merge conflicts, but it's mostly just from some folder changes. I tested it on my own stuff and assuming I'm doing it correctly (albeit slowly), most of it takes like 5 minutes.

mikeizbicki commented 9 years ago

Thanks! We had discussed that you'd be getting 110/100 on this project. I'm going to deduct 10 points for the more complicated merging procedure, giving you 100/100. I've entered the grade now, but I won't be going through the merging process for a few days probably.

cbarb005 commented 9 years ago

Yeah, sorry about that, I tried to minimize the conflicts as much as possible. Also, I completely forgot to add this, but I think I was supposed to remind you about the extra-credit for the writing center here. Wasn't too clear on that.

mikeizbicki commented 9 years ago

Thanks for the reminder. I've added +5 pts of extra credit.