diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..b87b897 Binary files /dev/null and b/.DS_Store differ diff --git a/README.md b/README.md index 493dc99..3367d8b 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,40 @@ -> :warning: **make commits to this file in your seperate branch! this file is NOT to be modified in the `master` branch!** - ---- - -add your name to this file below: -[*enter name here*] - -enter a fun fact about yourself below: -[*enter fun fact here*] - ---- - -## TABLE OF CONTENTS - -1) [repo-management](./repo-management) 📺 - - **[Install Git](./repo-management/git-install.md)** << - - **[Setup the Repository](./repo-management/repo-setup.md)** << - -2) [branch-setup](./branch-setup) 🎋 - - **[Create a Branch](./branch-setup/create-a-branch.md)** << - - [What are PRs? Merge vs. Rebase](./branch-setup/prs.md) - -3) [version-control](./version-control) 🔄 - - [Squashing Commits](./version-control/squashing.md) - - **[Cherry Picking and Tagging Commits](./version-control/cherry-and-tagging.md)** << - -\* bolded lessons in ToC are ones required to follow through for practical. we heavily suggest walking through ALL lessons, but in order to be eligible to take the practical, you MUST have the steps in the bolded lessons completed. - ---- - -## Layout 🚧 - -\* emoji layouts loosely inspired by [gitmoji](https://gitmoji.dev/), my favorite commit ettiquette policy :blobheart: - ---- - -approval status: ___ - -signed by: ___ +> :warning: **make commits to this file in your seperate branch! this file is NOT to be modified in the `master` branch!** + +--- + +add your name to this file below: +Oliver Cai + +enter a fun fact about yourself below: +I missed all of training since I had a concurrent class at the exact time. + +--- + +## TABLE OF CONTENTS + +1) [repo-management](./repo-management) 📺 + - **[Install Git](./repo-management/git-install.md)** << + - **[Setup the Repository](./repo-management/repo-setup.md)** << + +2) [branch-setup](./branch-setup) 🎋 + - **[Create a Branch](./branch-setup/create-a-branch.md)** << + - [What are PRs? Merge vs. Rebase](./branch-setup/prs.md) + +3) [version-control](./version-control) 🔄 + - [Squashing Commits](./version-control/squashing.md) + - **[Cherry Picking and Tagging Commits](./version-control/cherry-and-tagging.md)** << + +\* bolded lessons in ToC are ones required to follow through for practical. we heavily suggest walking through ALL lessons, but in order to be eligible to take the practical, you MUST have the steps in the bolded lessons completed. + +--- + +## Layout 🚧 + +\* emoji layouts loosely inspired by [gitmoji](https://gitmoji.dev/), my favorite commit ettiquette policy :blobheart: + +--- + +approval status: Approved + +signed by: TB +date = September 9, 2024 diff --git a/branch-setup/.DS_Store b/branch-setup/.DS_Store new file mode 100644 index 0000000..f0aa0b8 Binary files /dev/null and b/branch-setup/.DS_Store differ diff --git a/branch-setup/new-file-oliver-c.txt b/branch-setup/new-file-oliver-c.txt new file mode 100644 index 0000000..e80f788 --- /dev/null +++ b/branch-setup/new-file-oliver-c.txt @@ -0,0 +1,4 @@ +dale +in-n-out + +Zoe Cai (ignore the file name) \ No newline at end of file