Closed aef1004 closed 4 years ago
@aef1004 : I don't see anything here in the conflicting files that is likely to create a big problem when we merge in your branch, so I think we're good to go from the mechanical standpoint. The other faculty and I will look over the vocabulary and make suggestions in the next few days.
(Also, in terms of figuring out what happened, my best guess is that you might have missed doing the step of adding the remote---git remote add upstream git@github.com/geanders/csu_msmb.git
---before trying to pull the changes.)
@aef1004 : Very nice start on this! Technically, it looks like everything's looking good. I do have some suggestions for your definitions, and @baileyfosdick and @lyonsm7 might as well. Any changes you make and push to your GitHub version of the repo should be automatically added to this pull request, as long as we keep it open.
As a first comment, I was noticing that some of the terms here have similar ones in the previous chapter. That vocab was merged into the repo after you had your list, so I know that you didn't have access to it. I think it would be nice, though, to do what we can to keep the language specific. Here are a few suggestions along those lines (I'm doing these as checkboxes, so you can check off as you go along if it's helpful):
Also, for a few other things:
@geanders I've updated the vocab with your suggestions. I was a little bit unsure on three of the terms: identifiability, expectation function, and deoxyribonucleotide monophosphate.
I was also still having a few problems with being able to view the updated website on my own computer, but I think everything should be okay.
Regarding the forking, I had the git remote add upstream and it returns: "Fatal: remote upstream already exists." When I pull the upstream master, it says that the git@github.com/geanders/csu_msmb.git "does not appear to be a git repository."
For the fork update---yes, it certainly looks like you added the remote correctly. Looking at the code, there's a chance that one spot in the remote address should be a colon instead of a forward slash. It would be quickest if we check that in class. We'll need to have you remove that existing remote and then try the new one, and I can show you how to do that pretty quickly in person.
@aef1004 : Another student is getting the same error when she tries to update her fork. I gave her a suggestion to try if it is a problem from a typo in the code I originally posted for my suggestion to fix this. If you get a chance, try out the fix I suggested for her in our discussion of her pull request.
@aef1004 : I just made a few small wording changes to your vocabulary here (in commit 7e6bc34), but otherwise this satisfies everything I brought up in my comments. We'll see if @baileyfosdick or @lyonsm7 have any suggestions for edits and then we'll merge this in and make it public on the webpage. (Also, don't forget to update your Quizlet word list with the latest version of the list once it's finalized.)
Thanks! I updated the Quizlet as well.
To be honest, I didn't realize how much I rely on Word and Google docs to autocorrect all the words that I type so thank you for fixing those typos!
Oh, same! (regarding autocorrect)
Great! I've merged your changes into our master branch. I've set the post to be a "draft" for now---we'll change that after class today, once we can check in with the other faculty about whether they have edits.
I was having problems with updating my fork, but hopefully this should still work