Difference between revisions of "DPS909 & OSD600 Fall 2019"

From CDOT Wiki
Jump to: navigation, search
(Week 4)
Line 182: Line 182:
 
* [[DPS909 & OSD600 Fall 2019 - Lab 3|Lab 3]]
 
* [[DPS909 & OSD600 Fall 2019 - Lab 3|Lab 3]]
 
* [https://www.startupopenhouse.com/edition/5d4b38f82a1e660010743c67?displayMode=map Startup Open House Event Tonight, Thurs Sept 26 4-8]
 
* [https://www.startupopenhouse.com/edition/5d4b38f82a1e660010743c67?displayMode=map Startup Open House Event Tonight, Thurs Sept 26 4-8]
 +
 +
== Week 5 ==
 +
 +
* Forking vs. Merging
 +
** Anyone can fork, not everyone can get work merged back in
 +
** [https://hueniverse.com/my-repo-my-house-my-rules-1b2e860914d4 My Repo: my house my rules]
 +
** Some famous Forks
 +
*** Firefox from Mozilla Suite
 +
*** WebKit from KDE's KHTML
 +
*** Blink from WebKit
 +
*** Ubuntu from Debian
 +
*** Sun's StarOffice became OpenOffice became LibreOffice
 +
*** WordPress from Cafelog
 +
*** MariaDB from MySQL
 +
*** FireOS (Amazon for Kindle) from Android
 +
*** io.js from node.js, which eventually became the official node.js
 +
** Example Fork
 +
*** [https://github.com/Semantic-Org/Semantic-UI Semantic UI]
 +
*** [https://github.com/fomantic/Fomantic-UI Fomantic UI] - "Fomantic was created to continue active development of Semantic-UI and has the intent to be merged back into the master repository once active development can restart."
 +
 +
* Merging with git
 +
** Where <code>git branch</code> splits histories apart, <code>git merge</code> brings them back together
 +
** Understanding DIFFs and Patch files
 +
*** <code>git diff</code>, <code>git show</code>, <code>git log -p</code>, etc. to show DIFFs
 +
*** [https://github.com/filerjs/filer/pull/395 Pull Requests] also have links to get the raw [https://patch-diff.githubusercontent.com/raw/filerjs/filer/pull/395.diff .diff] and [https://patch-diff.githubusercontent.com/raw/filerjs/filer/pull/395.patch .patch]
 +
*** [https://blog.humphd.org/vocamus-906/ How to read a DIFF file]
 +
** Types of Merges: Fast Forward, Recursive Merges are the most common
 +
*** <code>--ff-only</code> 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
 +
**** <code>commit</code> your work if you can; or
 +
**** <code>stash</code> (<code>git stash list</code>, <code>git stash show</code>, <code>git stash pop</code>)
 +
*** checkout the branch you want to merge '''into'''
 +
*** <code>git merge branch_to_merge_into_this_branch</code>
 +
** Various flags and commands to know:
 +
*** <code>git merge --squash</code>
 +
*** <code>git merge --abort</code>
 +
*** <code>git merge --continue</code>
 +
*** <code>git branch -d</code>
 +
** Merge Conflicts
 +
*** Conflict markers <code><<<<<<<<<</code>, <code>=============</code>, <code>>>>>>>>>>>>></code>
 +
** [https://blog.humphd.org/fearless-merges/ Doing big merges in git]
 +
 +
* TODO
 +
** [[OSD & DPS909 Fall 2019 - Release 0.2|Release 0.2]]
 +
** Lab 4 - TBA

Revision as of 20:34, 29 September 2019

Week 1

  • Course introduction
  • Labs
    • Weekly labs, typically done in class
    • Labs are due on the Friday of the week they are assigned by midnight
    • Marked using Pass/Fail scheme
    • All labs must be completed to pass the course
    • Lab 1 is available now
  • Releases
    • 4 releases, some with multiple bugs/PRs required, including participating in Hacktoberfest 2019
    • Due Dates: Sept 20, Oct 31, Nov 20, Dec 6
    • Chance to work on real code, real projects
    • Big learning curve, lots of time required
    • Amazing chance to gain experience, network, build your skills and resume
    • Work with new and emerging technologies, gain exposure to tech outside the classroom
  • Discussion/Readings
    • Copyright (Copyright in Canada video)
      • IANAL
      • Who created it, "owns" it.
      • Set of exclusive rights granted to the work's creator
      • "The right to copy," to produce or reproduce a work or substantial portion thereof
      • Copyright is automatic when a work is created, you don't have to register it.
      • Copyright in Canada
      • Copyright Guide
      • In a software project, there can be many copyright holders (e.g., many contributors), or all contributors may assign their copyright to the project (e.g., CLA, which we'll cover later)

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

  • Introducing git and GitHub
    • Content Addressable Filesystem and Snapshots
    • Distributed: Local vs. Remote development
    • .git directory
    • Content Integrity, SHAs (Secure Hash Algorithm)
      • git init
      • echo 'test content' | git hash-object -w --stdin
      • ls .git/objects
      • git cat-file -p d670460b4b4aece5915caf5c68d12f560a9fe3e4
    • Blobs, Trees, and Commits
    • Branches, master
    • Working Directory, Staging Area, Repository
    • What do these commands really do?
      • git clone url-to-git-repo
      • git add file.txt
      • git status
      • git rm file.txt
      • git commit -m "Added file.txt"
    • Remotes, origin, upstream

Week 4

Week 5

  • Forking vs. Merging
    • Anyone can fork, not everyone can get work merged back in
    • My Repo: my house my rules
    • Some famous Forks
      • Firefox from Mozilla Suite
      • WebKit from KDE's KHTML
      • Blink from WebKit
      • Ubuntu from Debian
      • Sun's StarOffice became OpenOffice became LibreOffice
      • WordPress from Cafelog
      • MariaDB from MySQL
      • FireOS (Amazon for Kindle) from Android
      • io.js from node.js, which eventually became the official node.js
    • Example Fork
      • Semantic UI
      • Fomantic UI - "Fomantic was created to continue active development of Semantic-UI and has the intent to be merged back into the master repository once active development can restart."
  • 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