667
edits
Changes
no edit summary
* [[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]
== 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
