From 089298cbb61a50fa08fd03d2214fb1ff0ccfbe40 Mon Sep 17 00:00:00 2001 From: ZONGLIN Date: Sat, 9 Sep 2023 00:27:35 -0400 Subject: [PATCH 1/3] add my info --- basicinfo.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/basicinfo.tsx b/basicinfo.tsx index dac692b..5eac5e9 100644 --- a/basicinfo.tsx +++ b/basicinfo.tsx @@ -3,11 +3,11 @@ below variables and update them with stuff about you. Yeah... I know... the clas everyone dreads at the start of the semester. Sorry, I just needed a filler for you guys to edit. */ /*Un-comment this and fill in the info -const yourName : String = "Your name"; -let yourPronouns : String = "Pro/Nouns"; -const yourMajor : String = "Your major"; -let classification : String = "freshman/soph/junior/senior/supersenior"; -let oneExcite : String = "One thing you're excited about in this course"; -let anyConcerns : String = "If anything, list what you may be worried about in this course"; -let funFact : String = "And the classic, list one fun fact about yourself"; -*/ \ No newline at end of file +const yourName : String = "Zonglin Wu"; +let yourPronouns : String = "Handsome"; +const yourMajor : String = "CS"; +let classification : String = "junior"; +let oneExcite : String = "make software app by myself"; +let anyConcerns : String = "Nothing very concerned"; +let funFact : String = "I'm a DFO game pro"; +*/ From 1a8188f17a2ae1c392442369e372af0ff2d6920f Mon Sep 17 00:00:00 2001 From: ZONGLIN Date: Sat, 9 Sep 2023 00:28:59 -0400 Subject: [PATCH 2/3] why no lab 022L --- README.md | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index f48534c..4400c25 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,31 @@ # CISC275-Lab1 -Hello! For this lab, we want to delve into the workflow of GitHub. Last week, you had an assignment revolving around Git, so let's get into GitHub this week. This assignment should be super easy if you already have GitHub workflow experience. If you don't have much experience using GitHub, that's also fine! That's why we're doing this lab. -Some of this may be repetitive from last week, but if anything, more practice will help you get used to using Git & GitHub now as opposed to later. +Hello! For this lab, we want to delve into the workflow of GitHub. Last week, you had an assignment revolving around Git, so let's get into GitHub this week. This assignment should be super easy if you already have GitHub workflow experience. If you don't have much experience using GitHub, that's also fine! That's why we're doing this lab. + +Some of this may be repetitive from last week, but if anything, more practice will help you get used to using Git & GitHub now as opposed to later. As a general overview for this lab, we will: Fork a repository Invite collaborators to your repository -Create and modify a branch (So, task 2 again) +Create and modify a branch (So, task 2 again) Check the status of a repository Make, stage, and commit changes to a repository Push changes to the remote repository Pull upstream changes into your local repository Merge changes into master through a pull request Resolve merge conflicts (if necessary) - -How will this lab be graded? +How will this lab be graded? -Steps 1-3: 33% - -This will be checked through the repo URL you submit. For this part, we will be looking that the link of the repo you provide is a fork of the provided one in the assignment, your lab TA has been invited to collaborate with your repository, and you have a feature branch that has been modified. -Steps 4-6: 33% - -This will be graded by sending a screenshot of your terminal (either cmd, git, or VScode terminal, whichever you prefer). With the result of the git status, after you make changes, you stage and commit changes and push it to remote. This may need multiple screenshots, but that's ok. +Steps 1-3: 33% - +This will be checked through the repo URL you submit. For this part, we will be looking that the link of the repo you provide is a fork of the provided one in the assignment, your lab TA has been invited to collaborate with your repository, and you have a feature branch that has been modified. +Steps 4-6: 33% - +This will be graded by sending a screenshot of your terminal (either cmd, git, or VScode terminal, whichever you prefer). With the result of the git status, after you make changes, you stage and commit changes and push it to remote. This may need multiple screenshots, but that's ok. Steps 7-9: 33% - -We will check this by seeing the stuff you pull from upstream AFTER you push to remote and us seeing a successful pull request in your repo. The only change we, as TAs, will make will be in the readme.md file. +We will check this by seeing the stuff you pull from upstream AFTER you push to remote and us seeing a successful pull request in your repo. The only change we, as TAs, will make will be in the readme.md file. Submitting on time: 1% - Hey! As long as you submit this on time, you get AT LEAST a .1/10 :) - Resources you need for this assignment: @@ -37,31 +36,32 @@ How to do each of the steps: What you need to submit: A link to your GitHub Repository -Screenshots of your terminal for steps 4-6. - +Screenshots of your terminal for steps 4-6. If you don't finish this during your scheduled lab time, that's ok! But we encourage you to make your best attempt to get it done during lab time so we can guarantee you get help if you need it when you need it. If you have any questions about the wording of this lab, please email dmesser@udel.edu or ping him on the Discord channel #275-labs, as he could have made a typo or forgot to add a word in the directions. Edit for Lab Section 020L: -- -Hey yall here is my edit -Edit for Lab Section 021L: -- +- Hey yall here is my edit + +## Edit for Lab Section 021L: + Hello this is my edit -Edit for Lab Section 030L: -- +WHY THERE ARE NO LAB SECTION FOR 022L ????? + +## Edit for Lab Section 030L: + This edit is for my lab! Edit for Lab Section 031L: -- -This is my Lab -Edit for Lab Section 041L -- +- This is my Lab + +## Edit for Lab Section 041L + If you're seeing this change in your own repo, you have successfully completed Step 7! -Edit for late lab submissions -- +## Edit for late lab submissions + You have successfully completed Step 7. From 8c63d1e71c788153ea9c3fdf321abd60ac95d7d1 Mon Sep 17 00:00:00 2001 From: ZONGLIN Date: Sat, 9 Sep 2023 00:34:38 -0400 Subject: [PATCH 3/3] added my name --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4400c25..035edec 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # CISC275-Lab1 +Zonglin Wu Hello! For this lab, we want to delve into the workflow of GitHub. Last week, you had an assignment revolving around Git, so let's get into GitHub this week. This assignment should be super easy if you already have GitHub workflow experience. If you don't have much experience using GitHub, that's also fine! That's why we're doing this lab. Some of this may be repetitive from last week, but if anything, more practice will help you get used to using Git & GitHub now as opposed to later.