Difference between revisions of "DPS909 & OSD600 Fall 2018"

From CDOT Wiki
Jump to: navigation, search
(Week 5)
Line 197: Line 197:
 
*** <code>git merge --continue</code>
 
*** <code>git merge --continue</code>
 
*** <code>git branch -d</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]
 
** [https://blog.humphd.org/fearless-merges/ Doing big merges in git]

Revision as of 16:53, 3 October 2018

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

  • Consider Speaking and/or Attending the Free Software and Open Source Symposium (FSOSS).
  • Real world examples:
    • Filing, Fixing a bug in Filer
    • Adding a new Feature, Tests, and Docs to Filer - support node's new recursive fs.mkdir in Filer

Week 4

  • More Git
    • 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