From 08e89a615226ac5338c8898fa9f1d7768fd22940 Mon Sep 17 00:00:00 2001 From: Dhrumil Mehta Date: Thu, 11 Jan 2024 10:08:31 -0500 Subject: [PATCH 1/5] Update apireadings.md --- apis/apireadings.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apis/apireadings.md b/apis/apireadings.md index 55f62cb..b36c947 100644 --- a/apis/apireadings.md +++ b/apis/apireadings.md @@ -1,12 +1,13 @@ ## Reading -* **(required)** [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Chapter 1 -"Introduction: A Programmable Web" -* **(required)** [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Chapter 2 -"Building for Users: Designing URLs" -* **(recommended)** [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Chapter 3 -"Building for Search Engines: Following Rest" -* **(required)** [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Chapter 5 -"Building a Platform: Providing APIs" + +* [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up) +* "Building for Users: Designing URLs" Chapter 2 (p 9-13) ; +* "Building for Search Engines: Following Rest" Chapter 3 (all); +* "Building a Platform: Providing APIs"Chapter 5 (p 31-36) * [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Rest of the book is not required, but Chapter 7 is about Open Source if you're interested. -* **(required)** APIs that suck [video] - [https://www.infoq.com/presentations/API-design-mistakes] Additioanl Resources +* APIs that suck [video] - https://www.infoq.com/presentations/API-design-mistakes * [REST API Design - Resource Modeling](https://www.thoughtworks.com/insights/blog/rest-api-design-resource-modeling) (Thoughtworks) * [https://micropurchase.18f.gov/](https://micropurchase.18f.gov/) * Programmable Web - [https://www.programmableweb.com/about](https://www.programmableweb.com/about) From cbc2a75f3baed1fb59089d81c464102964ef2794 Mon Sep 17 00:00:00 2001 From: Dhrumil Mehta Date: Thu, 11 Jan 2024 10:08:43 -0500 Subject: [PATCH 2/5] Update apireadings.md --- apis/apireadings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/apireadings.md b/apis/apireadings.md index b36c947..2674860 100644 --- a/apis/apireadings.md +++ b/apis/apireadings.md @@ -4,7 +4,7 @@ * "Building for Users: Designing URLs" Chapter 2 (p 9-13) ; * "Building for Search Engines: Following Rest" Chapter 3 (all); * "Building a Platform: Providing APIs"Chapter 5 (p 31-36) -* [Aaron Swartz’s A Programmable Web](https://archive.org/details/AaronSwartzAProgrammableWeb/page/n3/mode/2up): Rest of the book is not required, but Chapter 7 is about Open Source if you're interested. +* Rest of the book is not required, but Chapter 7 is about Open Source if you're interested. Additioanl Resources * APIs that suck [video] - https://www.infoq.com/presentations/API-design-mistakes From 273777700694ec1d00255c0d9b9da68c72ee92c0 Mon Sep 17 00:00:00 2001 From: Dhrumil Mehta Date: Thu, 11 Jan 2024 10:09:02 -0500 Subject: [PATCH 3/5] Update apireadings.md --- apis/apireadings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/apireadings.md b/apis/apireadings.md index 2674860..b597d9a 100644 --- a/apis/apireadings.md +++ b/apis/apireadings.md @@ -6,7 +6,7 @@ * "Building a Platform: Providing APIs"Chapter 5 (p 31-36) * Rest of the book is not required, but Chapter 7 is about Open Source if you're interested. -Additioanl Resources +Additional Resources (Optional) * APIs that suck [video] - https://www.infoq.com/presentations/API-design-mistakes * [REST API Design - Resource Modeling](https://www.thoughtworks.com/insights/blog/rest-api-design-resource-modeling) (Thoughtworks) * [https://micropurchase.18f.gov/](https://micropurchase.18f.gov/) From d0f1e02a6307ff93a78eac3c8500a2d1fbe3917f Mon Sep 17 00:00:00 2001 From: Dhrumil Mehta Date: Fri, 26 Jan 2024 08:03:28 -0500 Subject: [PATCH 4/5] Update 12-workflow.md change master to main --- git/12-workflow.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/git/12-workflow.md b/git/12-workflow.md index 3fc3326..660e9df 100644 --- a/git/12-workflow.md +++ b/git/12-workflow.md @@ -7,13 +7,13 @@ When working with branches, here is the general workflow to adhere to. 1. Before starting work: ```bash - # always start your branching from the master branch - git checkout master + # always start your branching from the main branch + git checkout main # pull the latest git pull - # create a new branch, branch-ed off of the master branch + # create a new branch, branch-ed off of the main branch git checkout -b my-awesome-feature ``` @@ -33,13 +33,13 @@ When working with branches, here is the general workflow to adhere to. git push ``` -3. Also make sure to periodically pull from master: +3. Also make sure to periodically pull from main: ```bash - git pull origin master + git pull origin main ``` - **Pulling from master periodically is very important!** This will keep your code relatively in-sync and prevent deferring massive merge conflicts down the line. + **Pulling from main periodically is very important!** This will keep your code relatively in-sync and prevent deferring massive merge conflicts down the line. 4. When you're done with your work @@ -50,7 +50,7 @@ When working with branches, here is the general workflow to adhere to. git status ``` - then open up GitHub and **issue a pull request back to master**. + then open up GitHub and **issue a pull request back to main**. ## Workflow Types @@ -58,7 +58,7 @@ When working with branches, here is the general workflow to adhere to. ![](https://i.imgur.com/T6pJPY8.jpg) -The feature branch workflow is where every small or large feature gets its own branch. These branches are shortlived and are quickly merged back into master. Each feature branch corresponds to a pull request and the branch is deleted after the PR is merged. +The feature branch workflow is where every small or large feature gets its own branch. These branches are shortlived and are quickly merged back into main. Each feature branch corresponds to a pull request and the branch is deleted after the PR is merged. ### Team Member Branches From 4a088a5b9d7ebe8f4f3d9ff935663ffa3c8eaa9a Mon Sep 17 00:00:00 2001 From: Aarushi Sahejpal <60757108+aarushisahejpal@users.noreply.github.com> Date: Sun, 5 Jan 2025 16:02:10 -0500 Subject: [PATCH 5/5] Update 06-reading.md --- agile/06-reading.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/agile/06-reading.md b/agile/06-reading.md index c82e145..c91425d 100644 --- a/agile/06-reading.md +++ b/agile/06-reading.md @@ -13,9 +13,6 @@ - [Elements of Scrum](https://www.amazon.com/Elements-Scrum-Chris-Sims-ebook/dp/B004O0U74Q/ref=sr_1_2?s=digital-text&ie=UTF8&qid=1546492282&sr=1-2&keywords=elements+of+scrum) [Part I and Part II] - (Go ahead and read the whole thing if you find yourself interested, its not too long) -**Due Friday** - - Healthcare.gov Case Part A (provided on Slack) - Read by Friday - ## Additional Resources A shorter alternative to "Elements of Scrum" (in case you run out of time)