667
edits
Changes
no edit summary
* [[DPS909/OSD600 Fall 2017 Lab 5 | Lab 5]]
== Week 6 ==
* Register for [http://fsoss.ca FSOSS 2017] at table outside CS office at lunch time. $25 per student, includes lunch + swag.
* '''0.1 Release due in a few weeks (Oct 20)'''
** Please add all your bugs/pull requests to [[DPS909 & OSD600 Fall 2017 Bug List]]
** Work on your bugs, ask for help, help each other. Don't wait for things to happen, make them happen.
* '''Git and GitHub Workflow'''
# '''Fork''' the project's repo. We'll refer to this as the '''upstream''' repo.
# '''Clone''' your '''Fork''''ed repo locally. We'll refer to this as your '''origin''' (see below). <code>git clone <git-url></code>
# '''Add''' a '''remote''' for the '''upstream''' repo: <code>git remote add upstream <git-url></code>
# Confirm your remotes (you will need '''origin''' and '''upstream'''): <code>git remote -v</code>
# '''Setup''' your dev environment (e.g., <code>npm install</code>, <code>pip install ...</code>, build, etc.).
# '''Switch''' to your '''master''' branch: <code>git checkout master</code>
# '''Update''' your '''master''' branch with what's on the '''upstream''' repo's '''master''': <code>git pull upstream master</code>
# '''Create''' a '''branch''' (sometimes called a '''Topic Branch''') for your current work. Every bug, every experiment, everything you do gets its own branch: <code>git checkout -b branch-name master</code>
# '''Fix''' your code, '''add''' and '''commit''' your work on your topic '''branch''': <code>git commit -m "Fixing ..."</code>
# '''Push''' your '''branch''' to your '''origin''': <code>git push origin <branch-name></code>
# '''Create''' a '''Pull Request''' (PR) against the '''upstream''' repo on GitHub. If you're fixing a bug (e.g., Issue 1234) say that in the description: <code>Fixing #1234: ...</code>. Make sure you write a nice description of the fix, and how to test/confirm it.
# '''Fix''' any issues you hear back from reviewers by editing your branch, '''add''', '''commit''', and '''push''' again to the same branch on your origin: <code>git push origin <branch-name></code>. Your changes will get added to the pull request
# '''Communicate''' with the reviewers and let them know what you've done: <code>I fixed x, y, and z. Please review this again</code>.
# '''Repeat''' until you fix all the issues they find in your code.
# Once they '''merge''' your branch, you can go back to your '''master''' and '''pull''' in those changes. You won't ever merge into '''master''' manually.
