667
edits
Changes
→Week 3
* Discussion of projects found for [[DPS909 & OSD600 Fall 2019 - Lab 1|Lab 1]]
* [[DPS909 & OSD600 Fall 2019 - Lab 2|Lab 2]]
* [[OSD & DPS909 Fall 2019 - Release 0.1 will be released this week|Release 0.1]] due Mon, Sept 23 == Week 3 == * '''Readings/Resources'''** Courses on [http://www.senecacollege.ca/lynda/ Lynda]*** [https://www.lynda.com/Git-tutorials/Git-Essential-Training/100222-2.html?srchtrk=index%3a0%0alinktypeid%3a2%0aq%3agit%0apage%3a1%0as%3arelevance%0asa%3atrue%0aproducttypeid%3a2 Git Essential Training]*** [https://www.lynda.com/Git-tutorials/Up-Running-Git-GitHub/409275-2.html?srchtrk=index%3a0%0alinktypeid%3a2%0aq%3agit%0apage%3a1%0as%3arelevance%0asa%3atrue%0aproducttypeid%3a2 Up and Running with Git and GitHub]** Books*** [http://git-scm.com/book Pro Git]*** [http://www.ericsink.com/vcbe/index.html Version Control by Example, online book]** References*** [http://gitref.org/ Git Reference]*** [http://marklodato.github.com/visual-git-guide/index-en.html Visual Git Reference]*** [http://sixrevisions.com/resources/git-tutorials-beginners/ Overview of Git Tutorials (many good ones)]*** [http://help.github.com/ Github documentation]*** [https://desktop.github.com/ GitHub Desktop] * '''Introducing [http://git-scm.com/ git] and [https://github.com/ GitHub]'''** Content Addressable Filesystem and Snapshots** Distributed: Local vs. Remote development** .git directory** Content Integrity, SHAs (Secure Hash Algorithm)*** <code>git init</code>*** <code>echo 'test content' | git hash-object -w --stdin</code>*** <code>ls .git/objects</code>*** <code>git cat-file -p d670460b4b4aece5915caf5c68d12f560a9fe3e4</code>** Blobs, Trees, and Commits** Branches, <code>master</code>** Working Directory, Staging Area, Repository** What do these commands really do?*** <code>git clone url-to-git-repo</code>*** <code>git add file.txt</code>*** <code>git status</code>*** <code>git rm file.txt</code>*** <code>git commit -m "Added file.txt"</code>** Remotes, <code>origin</code>, <code>upstream</code> * Filing and Fixing a bug: a cookbook approach** [https://help.github.com/articles/set-up-git/ set up git and GitHub]*** https://help.github.com/ has lots of great articles to help you. You can also view [https://www.youtube.com/githubguides video guides] or read the [https://guides.github.com/ printed guides] *** [https://help.github.com/articles/setting-your-username-in-git/ setup your username in git]*** [https://help.github.com/articles/setting-your-commit-email-address-in-git/ setup your email address in git]*** [https://help.github.com/articles/associating-text-editors-with-git/ specify which editor git should use], for example [https://stackoverflow.com/questions/30024353/how-to-use-visual-studio-code-as-default-editor-for-git?answertab=active#tab-top you can use vscode] *** [https://help.github.com/articles/dealing-with-line-endings/ setup line endings (CRLF vs. LF) in git], [https://www.edwardthomson.com/blog/git_for_windows_line_endings.html extra notes for Windows users] *** [https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/ setup ssh keys for GitHub]** [https://help.github.com/articles/working-with-forks/ In GitHub, create a fork of the repo you want to work on]** [https://help.github.com/articles/cloning-a-repository/ On your computer, clone your forked repo]** [https://help.github.com/articles/adding-a-remote/ On your computer, add a remote named "upstream" for the original repo (vs. your fork)]** [https://help.github.com/articles/creating-an-issue/ On GitHub, find or create an Issue for the change you want to make]** [https://help.github.com/articles/about-branches/ On your computer, create and checkout a branch for your work, e.g., issue-1234 for Issue #1234]** [https://www.atlassian.com/git/tutorials/saving-changes On your computer, make code changes, test them, add, and commit on your branch. Repeat as necessary.]** [https://help.github.com/articles/pushing-to-a-remote/ On your computer, push your changes (commits) to your fork (origin)]** [https://help.github.com/articles/creating-a-pull-request/ On GitHub, create a Pull Request for your changes to get sent to the upstream repo]** [https://www.youtube.com/watch?v=e41HPOHX9aE On your computer, fix any problems pointed out by your reviewer(s), add the file(s), commit, and push again to update your pull request] * [[OSD & DPS909 Fall 2019 - Release 0.1|Release 0.1]] due Mon, Sept 23
