From c79cf9d471b4c5af64efc6f3977b2adbbb288718 Mon Sep 17 00:00:00 2001
From: oliver <116319227+queerboi@users.noreply.github.com>
Date: Mon, 9 Sep 2024 18:47:29 -0700
Subject: [PATCH] Approved Zoe Cai

---
 .DS_Store                          | Bin 0 -> 6148 bytes
 README.md                          |  79 +++++++++++++++--------------
 branch-setup/.DS_Store             | Bin 0 -> 6148 bytes
 branch-setup/new-file-oliver-c.txt |   4 ++
 4 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 branch-setup/.DS_Store
 create mode 100644 branch-setup/new-file-oliver-c.txt

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b87b897f73b54dd00376ff86c68c80b18646f789
GIT binary patch
literal 6148
zcmeHKO>fgc5S>i}by`p(6{KE}EO8Abv;|T1VnTZ0z@<iT02J)nYAqbEWjoCwisUo=
z7_R&h{tG8~v%8h@(So?ps@joe-*|VPH-2mHWQj=hM$r?ZHW4{+#^xHD3yjCvm#krW
zm?zXdj_H&hQAsgXOWC%=Dqt13ZVK?Xdxt_QD4>jHzuyt%uTps&rZPkhZxAow+rN|{
z`U5W<m$~765A!rBt8Vv)Xsk4E-ClK8optA<e=5g*6;z|L7ZmUL>W!3XcpeAg+aw+j
z+V@_{tO}AWE)*e&Vx)X{mt>I~_v9#xO2zf{fYWkXgZ9>Bvh(zL$KBoApLX2I{!X{!
z?(IICPFv3XhmQ}A2A|VmCcmgBAc1{L*<FL@@D;(Ox}5n%mdfk|Im~a-5gkIEKD`ER
z(~zPC<-Q?nR=Ex69aBycyX8<RAJ7SUhVYE4dA4})Z|obQ{$Dg&Sc6SeoEVj-f};Eu
z$555yQpH@4E?5`At310dYjmboAi~NN6d}&3Tv&~t3!DwbDKJw4R;K1>tZ)ZO={&o^
z@67CsxV$nm@4mBsWxv2qY!$EyTvr8ne{kW9p21q9+B(pvBLJ|8Ze@u1uL5&igPy@!
zBSv6CQ-PW)%n?IqI{ICc=NYUuYB~vX_z-4hVNNJQ&5rxKDxHL<(Y96rtH8VhEBdm{
z_5bkl^Zz`_URedK0yjzl(d_&E9v;cm)}@EzTI<3;!Pz*k)~G0GOgUBom*OqBGK{$#
W06l}XM)bh!9|0wUZL9+SRe|4V&F)A5

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f0aa0b82de3ef58b5e079379640851fcbb381da7
GIT binary patch
literal 6148
zcmeHKOG?B*5Phvd2HXsS;6~^RIG`tp!?<wm1)Rx@IuMOy;%Awi$MJ~qRaGly%vwaM
zp!!vJ*QfI!{Q(fBPs>wa3}8eR3}Ot33=dB2B<GA6G)IFKPB5n~1`_?nAzAwY3e;Tr
z9N*Vpv;V-EJ4|qo<z-nFi?WjM60**zlTL*ekYP=)TWq%c-naY?nRA5~GIYa;Qu(Tg
zYdq7gIbN_{gI6^DOyP~0&a7hB(cZ%&{Wn9a3&&ek*>!OSoB?OR8E^&?13a@uM*D`|
zIs?vtGw{WL><^JDm?vxvb?acGPXMA^qg80j^;lwJ!aQMX$QeqoP@;u~^u!1j&heQ1
z@`SCSg(GNX=1G-5A1^_xb3Cd$LT>1-GvEyL8Q8V%SkC_o{xXA){C<e{oB?OxpD_@!
z+0|^yk4k6jkI$2{Hd3#tBI4JIL80Bd1h6Cf$dOLkd=#60dBWCEvdFlG6a6Bfgm~i&
H`~m|X5qU@=

literal 0
HcmV?d00001

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