illinois-cs241 / illinois-cs241.github.io

CS 241 course website
http://cs241.cs.illinois.edu
Other
28 stars 18 forks source link

lockpicking lab: add --no-rebase flag #306

Closed nsunkad closed 9 months ago

nsunkad commented 9 months ago

we get several student questions on Edstem each year about git pull not working (due to improper flag usage). let's preemptively address these questions

nd-0r commented 9 months ago

Looks good, I'll open another PR to link to the GitHub auth docs I pushed last night.

nsunkad commented 9 months ago

@nd-0r noticed on the Development page we recommend GH and SSH keys for auth purposes, but on the lockpicking lab handout we recommend GH and personal access token

https://cs341.cs.illinois.edu/assignments/lockpicking_lab https://cs341.cs.illinois.edu/tutorials/development

nd-0r commented 9 months ago

@nsunkad I was going to move the Git setup stuff to the development guide and add the PAT option to the development guide as well, because we already link to the development guide in the lockpicking docs. Do you think that would make sense?

nd-0r commented 9 months ago

Here's the new PR: https://github.com/illinois-cs241/illinois-cs241.github.io/pull/307