Difference between revisions of "DPS909 & OSD600 Winter 2019"

From CDOT Wiki
Jump to: navigation, search
(Week 9)
Line 283: Line 283:
* Releases 0.3 and 0.4
* Releases 0.3 and 0.4
** * [[DPS909/OSD600 Winter 2019 Lab 8|Lab 8]] due Fri, Mar 15
** [[DPS909/OSD600 Winter 2019 Lab 8|Lab 8]] due Fri, Mar 15
** [[OSD & DPS909 Winter 2019 Release 0.3|Release 0.3]] due Fri, Mar 29
** [[OSD & DPS909 Winter 2019 Release 0.3|Release 0.3]] due Fri, Mar 29
** [[OSD & DPS909 Winter 2019 Release 0.4|Release 0.4]] due Fri, Apr 12
** [[OSD & DPS909 Winter 2019 Release 0.4|Release 0.4]] due Fri, Apr 12

Revision as of 15:33, 12 March 2019

Week 1

  • Course introduction

Week 2

  • Licenses
    • Rights, privileges, responsibilities, etc. applicable to someone other than the work's creator
    • "Terms and Conditions"
    • These must be granted by a copyright holder

Week 3

Week 4

  • More Git
    • Understanding how git works
      • SHAs
      • commits, trees, blobs
      • branches
      • Working Directory vs. Staging Area vs. HEAD
    • Git Walkthrough Part I
    • Git Walkthrough Part II
    • Some basic git commands you should make sure you know how to use:
      • git clone - clone an existing repository (i.e., one you've forked on GitHub)
      • git status - check what's happening with your repo, working directory, branch info
      • git add - add a file, files, or folder(s) of file(s)
      • git commit - commit changes in the staging area
      • git log - look back at existing commits
      • git diff - look at the difference between what's in the working directory and staging area, or between two commits
      • git rm - remove a file
      • git mv - move or rename a file
      • git reset - update the staging area, and perhaps working directory, with files from another commit (e.g., HEAD)
      • git checkout - switch to a branch or commit, or create, or get files from a branch/commit

Week 5

  • Merging with git
    • Where git branch splits histories apart, git merge brings them back together
    • Understanding DIFFs and Patch files
    • Types of Merges: Fast Forward, Recursive Merges are the most common
      • --ff-only to force a fast-forward (only the branch pointer is moved, no new commit is created)
      • 3-way merges: two branch commits with a common ancestor (new commit is created with multiple parents)
      • Can have any number of parents though: one of the larges is a 66 commit octopus merge in the Linux kernel
    • How to merge
      • start with a clean working directory
        • commit your work if you can; or
        • stash (git stash list, git stash show, git stash pop)
      • checkout the branch you want to merge into
      • git merge branch_to_merge_into_this_branch
    • Various flags and commands to know:
      • git merge --squash
      • git merge --abort
      • git merge --continue
      • git branch -d
    • Merge Conflicts
      • Conflict markers <<<<<<<<<, =============, >>>>>>>>>>>>
    • Doing big merges in git

Week 6

  • git rebase branch
    • Replay commits on a new base branch/commit
    • Process goes like this:
      • git finds a common ancestor commit of the branch you're on, and the one you're rebasing onto
      • git calculates DIFFs for each, saves them to disk
      • git checks out the commit you want to branch onto, and begins to replay those diffs one by one
      • if there is a merge conflict, the rebase pauses so you can fix things
      • use git rebase --continue or git rebase --abort to move forward after such a pause
      • use git rebase --skip to ignore the current commit and keep going
    • Never rebase commits that are shared publicly in another repo. Only do it on commits you own locally (e.g., a topic branch you are working on)
    • Don't use rebase to get rid of commits in a public branch, use git revert commit-sha instead to apply an inverse commit
    • If you rebase a branch you've pushed (e.g., for a pull request), when you push, use git push origin branch-name -f (f means force and will overwrite)
    • git rebase -i for interactive rebase
      • shows a script of all commits in reverse order (order they will be replayed). You can hand edit this to remove, re-order, or combine commits
    • You can squash on the same branch by rebasing on HEAD~n where n is how many commits back from HEAD to go
  • git cherry-pick SHA to add a commit to the current branch

Week 7

  • Continue working on 0.2
    • Discussion of any issues/questions you have
    • Update blog post #2 due on Friday
    • 2 Weeks left, you should have ~2 PRs done by Friday to stay on track

Week 8

  • Finish and Submit 0.2
    • Take some time to read your colleague's reflection posts, some examples:
    • Jatin
    • Woosle
    • Olena

Week 9