From 7698a587ebf4508c41f0732ae139f63be75d651f Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Mon, 5 Sep 2022 19:44:39 +0530 Subject: [PATCH 01/50] Challenge5: Create a contributor folder --- contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md diff --git a/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..d4ebe55c8 --- /dev/null +++ b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,4 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +--- \ No newline at end of file From 433d6765965753ec2c55518e4650ac991c8cce3a Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 4 Sep 2022 12:20:08 +0530 Subject: [PATCH 02/50] challenge 12: Squash Unnecessary commits Signed-off-by: shubhansu-kr --- Challenges/challenge_4.md | 11 +++++++++++ contributors/shivaylamba/shivaylamba.md | 4 ++++ contributors/shubhansu-kr/shubhansu-kr-2.md | 1 + contributors/shubhansu-kr/shubhansu-kr.md | 6 ++++++ 4 files changed, 22 insertions(+) create mode 100644 Challenges/challenge_4.md create mode 100644 contributors/shivaylamba/shivaylamba.md create mode 100644 contributors/shubhansu-kr/shubhansu-kr-2.md create mode 100644 contributors/shubhansu-kr/shubhansu-kr.md diff --git a/Challenges/challenge_4.md b/Challenges/challenge_4.md new file mode 100644 index 000000000..42336996c --- /dev/null +++ b/Challenges/challenge_4.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 4 + +Welcome to the fourth challenge! +Today we cover how to Update Fork Repo From the Original Repo + +The main repository has been updated since the last fork that all of you created. The goal is to updated the forked repository with the changes made in the original repository. This can be done with the git command of ``git remote add upstream`` + +Task +1. Update your forked repository locally with the content of the original repository for both the main branch and the branch that you created in Challenge 3 using the ``git remote add upstream`` command +2. Once the changes in the forked repository and the original repository are synced in the git branch that you created in the 3rd Challenge, Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- Screenshot showing the latest repository contents \ No newline at end of file diff --git a/contributors/shivaylamba/shivaylamba.md b/contributors/shivaylamba/shivaylamba.md new file mode 100644 index 000000000..6e3107508 --- /dev/null +++ b/contributors/shivaylamba/shivaylamba.md @@ -0,0 +1,4 @@ +--- +name: Shivay Lamba +github_user: shivaylamba +--- \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr-2.md b/contributors/shubhansu-kr/shubhansu-kr-2.md new file mode 100644 index 000000000..4aeb73bb7 --- /dev/null +++ b/contributors/shubhansu-kr/shubhansu-kr-2.md @@ -0,0 +1 @@ +# Add any details you want \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr.md b/contributors/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..4dd5e1d1e --- /dev/null +++ b/contributors/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,6 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/292 +your_favroite_programming_language: cpp +--- \ No newline at end of file From 89fb5b0d3b7a0df1e6a86c66275fee3a03ca3fd5 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Tue, 13 Sep 2022 20:06:06 +0530 Subject: [PATCH 03/50] Added new file Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 9 +++++++++ contributors/shubhansu-kr/shubhansu-kr-2.md | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 contributors/shubhansu-kr/Challenge13.md delete mode 100644 contributors/shubhansu-kr/shubhansu-kr-2.md diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md new file mode 100644 index 000000000..8254bb3c9 --- /dev/null +++ b/contributors/shubhansu-kr/Challenge13.md @@ -0,0 +1,9 @@ +Welcome to the 13th Challenge + +Today's challenge involves how to use git stash command effectively. You can refer on how to stash your commits here + +Task: + +Inside the branch you created in the previous challenge your-username-details create a new file inside the contributors// directory. +Use the git stash command to move these changes to the stash area +Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr-2.md b/contributors/shubhansu-kr/shubhansu-kr-2.md deleted file mode 100644 index 4aeb73bb7..000000000 --- a/contributors/shubhansu-kr/shubhansu-kr-2.md +++ /dev/null @@ -1 +0,0 @@ -# Add any details you want \ No newline at end of file From d8575c4e4ed12a587352517cfdabeb2dba483f57 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Wed, 14 Sep 2022 23:30:58 +0530 Subject: [PATCH 04/50] Updated challenge14 Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md index 8254bb3c9..faf35ec40 100644 --- a/contributors/shubhansu-kr/Challenge13.md +++ b/contributors/shubhansu-kr/Challenge13.md @@ -1,9 +1 @@ -Welcome to the 13th Challenge - -Today's challenge involves how to use git stash command effectively. You can refer on how to stash your commits here - -Task: - -Inside the branch you created in the previous challenge your-username-details create a new file inside the contributors// directory. -Use the git stash command to move these changes to the stash area -Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge \ No newline at end of file +Challenge14: Solve Merge Conflict \ No newline at end of file From c8cf1ad395820c7a4a0a0b11c016714282f28269 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Wed, 14 Sep 2022 23:32:09 +0530 Subject: [PATCH 05/50] Updated challenge 14 in branch1 Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md index 8254bb3c9..6d3f098b7 100644 --- a/contributors/shubhansu-kr/Challenge13.md +++ b/contributors/shubhansu-kr/Challenge13.md @@ -1,9 +1,2 @@ -Welcome to the 13th Challenge - -Today's challenge involves how to use git stash command effectively. You can refer on how to stash your commits here - -Task: - -Inside the branch you created in the previous challenge your-username-details create a new file inside the contributors// directory. -Use the git stash command to move these changes to the stash area -Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge \ No newline at end of file +Making some random changes +to create a conflict \ No newline at end of file From 0813ccb035815eae2860c569af7efc5a7d2bbfd6 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:22:33 +0530 Subject: [PATCH 06/50] Updated Challenger's list Signed-off-by: shubhansu-kr --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 47394f4f2..22b49300d 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,4 @@ # List of challengers 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) +3. [shubhansu-kr](https://github.com/shubhansu-kr) \ No newline at end of file From 46dc912cd707840561407a6f879dae3e2094034c Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:27:46 +0530 Subject: [PATCH 07/50] Merge conflict Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 3053335a2..789b01f2c 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,6 +1,10 @@ ## Welcome to Challenge 5 +<<<<<<< HEAD Welcome to the fifth challenge! +======= +Welcome to the fourth challenge! +>>>>>>> e5a28d5 (Challenge 5) Today's goal is to update your forked repository and then create a Pull Request Task @@ -25,4 +29,8 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` +<<<<<<< HEAD 5. Submit your Pull Request on the main challenge repo. +======= +5. Submit your Pull Request +>>>>>>> e5a28d5 (Challenge 5) From c895d693b2672e8aaf9e8363a3c11f9078baca20 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:27:46 +0530 Subject: [PATCH 08/50] Merge conflict Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 3053335a2..789b01f2c 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,6 +1,10 @@ ## Welcome to Challenge 5 +<<<<<<< HEAD Welcome to the fifth challenge! +======= +Welcome to the fourth challenge! +>>>>>>> e5a28d5 (Challenge 5) Today's goal is to update your forked repository and then create a Pull Request Task @@ -25,4 +29,8 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` +<<<<<<< HEAD 5. Submit your Pull Request on the main challenge repo. +======= +5. Submit your Pull Request +>>>>>>> e5a28d5 (Challenge 5) From 55e8ea05d17d4f2d516a7c008bb8e0a566ae56d3 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:12:19 +0530 Subject: [PATCH 09/50] Make final update to ReadME Signed-off-by: shubhansu-kr --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1dbd2300e..6c03e71e7 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ ## What is the Scaler September Open Source Challenge? +Link for [Notion page](https://scalerdiscord.notion.site/scalerdiscord/Open-Source-September-Scaler-Discord-Community-f9306c7dc15a464ba1b6ea7ee30cdf0d). + Every day throughout September, for those who have enrolled, we will share one task.  Participants will need to use their knowledge of Git and Github for each task, and the difficulty level of the tasks will rise daily. @@ -28,7 +30,7 @@ If you haven't already, create an account on Github, and brush up on your skills ### Step 3 -Head to the official Scaler Open Source challenge repository. Star it. +Head to the official [Scaler Open Source challenge repository](https://github.com/scaleracademy/scaler-september-open-source-challenge/). Star it. Keep track of the README, as a new task will be added every day. @@ -48,3 +50,8 @@ Here is the reward [tier list](https://scalerdiscord.notion.site/3eabe9a1900c4b8 For all communications and queries, you can join our [Discord Server](https://discord.com/invite/scaler). ## Resources +1. Launch Video for the September Challenge: [Guide to Github and the Open Source Challenge](https://youtu.be/70nx_YxE56Q) +2. Git Tutorial: [Full Git Tutorial](https://www.youtube.com/watch?v=ZtfZGVQWjew) +3. Find good first issues to contribute to: [Good First issues](https://goodfirstissue.dev/) +4. Getting started with Github: [All you need to know about Github](https://www.youtube.com/watch?v=8WYXWs96xxc) +5. How to contribute to Open Source: [Open Source contribution guide](https://www.youtube.com/watch?v=ABty2r3nDyU) From eef73ab2611618895e3dc957e1b9f798e426b9df Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:34:00 +0530 Subject: [PATCH 10/50] Create CONTRIBUTING.md Signed-off-by: shubhansu-kr --- CONTRIBUTING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..5ed6b25df --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +## Contributing Guidelines + +Thank you for considering contributing to the repository. This guide details all the general information that one should know before contributing to the project. +Please stick as close as possible to the guidelines. That way we ensure that you have a smooth experience contributing to this project. + +### General Rules : +These are in general rules that you should be following while contributing to an Open Source project : + +- Be Nice, Be Respectful (BNBR) +- Check if the Issue you created, exists or not. +- While creating a new issue make sure you describe the issue clearly. +- Make proper commit messages and document your PR well. +- Always add Comments in your Code and explain it at points, if possible add Doctest. +- Always create a Pull Request from a Branch; Never from the Main. +- Follow proper code conventions because writing clean code is important. From fa902e210a61ea9edea41c851c3fbaffe9ade288 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:34:37 +0530 Subject: [PATCH 11/50] Add Challenge 1 Signed-off-by: shubhansu-kr --- Challenges/challenge_1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Challenges/challenge_1.md diff --git a/Challenges/challenge_1.md b/Challenges/challenge_1.md new file mode 100644 index 000000000..c4522c6fa --- /dev/null +++ b/Challenges/challenge_1.md @@ -0,0 +1,4 @@ +## Welcome to Challenge 1 + +Welcome to the first challenge! +We will start off with an easy task. \ No newline at end of file From f77d9951f40ed950bd52e72631003a211bb63945 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:47:22 +0530 Subject: [PATCH 12/50] Update challenge_1.md Signed-off-by: shubhansu-kr --- Challenges/challenge_1.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Challenges/challenge_1.md b/Challenges/challenge_1.md index c4522c6fa..cd0158bfa 100644 --- a/Challenges/challenge_1.md +++ b/Challenges/challenge_1.md @@ -1,4 +1,12 @@ ## Welcome to Challenge 1 Welcome to the first challenge! -We will start off with an easy task. \ No newline at end of file +We will start off with an easy task. + +Task: +Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue: + +``` +name: Add your name here +github_user_name: add your github username here +``` From 91d2b2e44ebcc8ec0541ddbd3ebc60899eed27ce Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:47:44 +0530 Subject: [PATCH 13/50] Update challenge_1.md Signed-off-by: shubhansu-kr --- Challenges/challenge_1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_1.md b/Challenges/challenge_1.md index cd0158bfa..ca104e9bf 100644 --- a/Challenges/challenge_1.md +++ b/Challenges/challenge_1.md @@ -4,7 +4,7 @@ Welcome to the first challenge! We will start off with an easy task. Task: -Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue: +Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue: ``` name: Add your name here From a824cd906b21facaaefeb5441ca8d0bdaeea0065 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 2 Sep 2022 12:10:51 +0530 Subject: [PATCH 14/50] Create challenge_2.md Signed-off-by: shubhansu-kr --- Challenges/challenge_2.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_2.md diff --git a/Challenges/challenge_2.md b/Challenges/challenge_2.md new file mode 100644 index 000000000..ebf050b64 --- /dev/null +++ b/Challenges/challenge_2.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 2 + +Welcome to the second challenge! +Today we will focus on how to fork and create a clone of a Github repository + +Task: +1. Create a fork of this repository +2. Clone the forked project locally in your system using the ``git clone`` command +3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- URL of your forked repository +- A screenshot of the cloned project in your system From c2b7e5455433605e3782986fabfc6e0688d5e344 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 3 Sep 2022 12:06:05 +0530 Subject: [PATCH 15/50] Create challenge_3.md Signed-off-by: shubhansu-kr --- Challenges/challenge_3.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Challenges/challenge_3.md diff --git a/Challenges/challenge_3.md b/Challenges/challenge_3.md new file mode 100644 index 000000000..835579e1c --- /dev/null +++ b/Challenges/challenge_3.md @@ -0,0 +1,10 @@ +## Welcome to Challenge 3 + +Welcome to the third challenge! +Today we will focus on how to create a new branch in a git repository + +Task: +1. Following up on the [previous task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_2.md), create a new branch locally in your forked clone repository +2. The branch name should be as follows: ``your_github_username-details``. Example: ``shivaylamba-details`` +3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- Screenshot showing the list of all the current branches inside of your forked clone repository From 3bf05a052ef2a0504025a59bdd364f8ac4f5dc12 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 4 Sep 2022 12:20:08 +0530 Subject: [PATCH 16/50] challenge 12: Squash Unnecessary commits Signed-off-by: shubhansu-kr --- Challenges/challenge_4.md | 11 +++++++++++ contributors/shivaylamba/shivaylamba.md | 4 ++++ contributors/shubhansu-kr/shubhansu-kr-2.md | 1 + contributors/shubhansu-kr/shubhansu-kr.md | 6 ++++++ 4 files changed, 22 insertions(+) create mode 100644 Challenges/challenge_4.md create mode 100644 contributors/shivaylamba/shivaylamba.md create mode 100644 contributors/shubhansu-kr/shubhansu-kr-2.md create mode 100644 contributors/shubhansu-kr/shubhansu-kr.md diff --git a/Challenges/challenge_4.md b/Challenges/challenge_4.md new file mode 100644 index 000000000..42336996c --- /dev/null +++ b/Challenges/challenge_4.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 4 + +Welcome to the fourth challenge! +Today we cover how to Update Fork Repo From the Original Repo + +The main repository has been updated since the last fork that all of you created. The goal is to updated the forked repository with the changes made in the original repository. This can be done with the git command of ``git remote add upstream`` + +Task +1. Update your forked repository locally with the content of the original repository for both the main branch and the branch that you created in Challenge 3 using the ``git remote add upstream`` command +2. Once the changes in the forked repository and the original repository are synced in the git branch that you created in the 3rd Challenge, Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- Screenshot showing the latest repository contents \ No newline at end of file diff --git a/contributors/shivaylamba/shivaylamba.md b/contributors/shivaylamba/shivaylamba.md new file mode 100644 index 000000000..6e3107508 --- /dev/null +++ b/contributors/shivaylamba/shivaylamba.md @@ -0,0 +1,4 @@ +--- +name: Shivay Lamba +github_user: shivaylamba +--- \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr-2.md b/contributors/shubhansu-kr/shubhansu-kr-2.md new file mode 100644 index 000000000..4aeb73bb7 --- /dev/null +++ b/contributors/shubhansu-kr/shubhansu-kr-2.md @@ -0,0 +1 @@ +# Add any details you want \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr.md b/contributors/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..4dd5e1d1e --- /dev/null +++ b/contributors/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,6 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/292 +your_favroite_programming_language: cpp +--- \ No newline at end of file From 9c18132e1e2931577c6f065da9687f557f984d9f Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Tue, 13 Sep 2022 20:06:06 +0530 Subject: [PATCH 17/50] Added new file Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 9 +++++++++ contributors/shubhansu-kr/shubhansu-kr-2.md | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 contributors/shubhansu-kr/Challenge13.md delete mode 100644 contributors/shubhansu-kr/shubhansu-kr-2.md diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md new file mode 100644 index 000000000..8254bb3c9 --- /dev/null +++ b/contributors/shubhansu-kr/Challenge13.md @@ -0,0 +1,9 @@ +Welcome to the 13th Challenge + +Today's challenge involves how to use git stash command effectively. You can refer on how to stash your commits here + +Task: + +Inside the branch you created in the previous challenge your-username-details create a new file inside the contributors// directory. +Use the git stash command to move these changes to the stash area +Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge \ No newline at end of file diff --git a/contributors/shubhansu-kr/shubhansu-kr-2.md b/contributors/shubhansu-kr/shubhansu-kr-2.md deleted file mode 100644 index 4aeb73bb7..000000000 --- a/contributors/shubhansu-kr/shubhansu-kr-2.md +++ /dev/null @@ -1 +0,0 @@ -# Add any details you want \ No newline at end of file From 62a2bfac3dff4576edaddacbe6333fddd7d90b16 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Wed, 14 Sep 2022 23:32:09 +0530 Subject: [PATCH 18/50] Updated challenge 14 in branch1 Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md index 8254bb3c9..6d3f098b7 100644 --- a/contributors/shubhansu-kr/Challenge13.md +++ b/contributors/shubhansu-kr/Challenge13.md @@ -1,9 +1,2 @@ -Welcome to the 13th Challenge - -Today's challenge involves how to use git stash command effectively. You can refer on how to stash your commits here - -Task: - -Inside the branch you created in the previous challenge your-username-details create a new file inside the contributors// directory. -Use the git stash command to move these changes to the stash area -Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge \ No newline at end of file +Making some random changes +to create a conflict \ No newline at end of file From 7fae24d6f24307ac3cf2e9526e8a1274c8b69f18 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:43:47 +0530 Subject: [PATCH 19/50] Merge Signed-off-by: shubhansu-kr --- contributors/shubhansu-kr/Challenge13.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md index 6d3f098b7..2988694f9 100644 --- a/contributors/shubhansu-kr/Challenge13.md +++ b/contributors/shubhansu-kr/Challenge13.md @@ -1,2 +1,6 @@ +<<<<<<< HEAD Making some random changes -to create a conflict \ No newline at end of file +to create a conflict +======= +Challenge14: Solve Merge Conflict +>>>>>>> d8575c4 (Updated challenge14) From 837e5c090f252ef602873b311180b5c4ba995cda Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Mon, 5 Sep 2022 19:44:39 +0530 Subject: [PATCH 20/50] Challenge5: Create a contributor folder Signed-off-by: shubhansu-kr --- contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md diff --git a/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..d4ebe55c8 --- /dev/null +++ b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,4 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +--- \ No newline at end of file From 93d9a95b9ee41b05e29182bce49373b641b66277 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:35:54 +0530 Subject: [PATCH 21/50] Challenge 5 Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Challenges/challenge_5.md diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md new file mode 100644 index 000000000..860e46c4c --- /dev/null +++ b/Challenges/challenge_5.md @@ -0,0 +1,28 @@ +## Welcome to Challenge 5 + +Welcome to the fourth challenge! +Today's goal is to update your forked repository and then create a Pull Request + +Task +1. Ensure your forked repository is in sync with the latest changes in the main repository. Also ensure that the git branch that you created in Challenge 2 is also in sync with the latest changes +2. Create a new folder inside the `contributors` folder, and name it with your github username. It should look something like this `contributors//`. Ex. + +``` +contributors/shivaylamba/ +``` + +3. Create a markdown file in the folder you created following the naming convention for the file: `.md`. Ex. + +``` +contributors/shivaylamba/shivaylamba.md +``` + +4. Copy the following template into your file, delete the placeholder text and fill the information with yours. + +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +--- +``` +5. Submit your Pull Request \ No newline at end of file From e1adab4a986cb271955f089dd444db28de36197b Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:36:17 +0530 Subject: [PATCH 22/50] Update challenge_5.md Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 860e46c4c..3d05c739f 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,6 +1,6 @@ ## Welcome to Challenge 5 -Welcome to the fourth challenge! +Welcome to the fifth challenge! Today's goal is to update your forked repository and then create a Pull Request Task @@ -25,4 +25,4 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -5. Submit your Pull Request \ No newline at end of file +5. Submit your Pull Request From 038e7c5e625dec3dd5ad4f8319ee623fface11d1 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:37:48 +0530 Subject: [PATCH 23/50] Update challenge_5.md Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 3d05c739f..3053335a2 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -25,4 +25,4 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -5. Submit your Pull Request +5. Submit your Pull Request on the main challenge repo. From e79d32d3725e7a2fb44aa5c669c9c2ce193910ca Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 24/50] Create challenge_6.md Signed-off-by: shubhansu-kr --- Challenges/challenge_6.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge_6.md diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md new file mode 100644 index 000000000..aea62ab79 --- /dev/null +++ b/Challenges/challenge_6.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 6 + +Welcome to the sixth challenge! +Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) + +Task +1. Create a new commit in the branch you created in Challenge 2 in your forked repository +2. The change that you have to make should be the following: +In the markdown file that was created in Challenge 5, edit the details as follows: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_isse: Link_of_the_github_issue_created_in_first_challenge +--- +``` +3. After making this change create a commit with a proper commit message and push the changes +4. Check if the commit reflects in the Pull request you created in Challenge 5 + From 3444303f543f0a65b48e67ef972e151ed74a9bf8 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:27 +0530 Subject: [PATCH 25/50] Update challenge_6.md Signed-off-by: shubhansu-kr --- Challenges/challenge_6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index aea62ab79..701d59f78 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -11,7 +11,7 @@ In the markdown file that was created in Challenge 5, edit the details as follow --- name: your_name github_user_name: YOUR-GITHUB-USERNAME -url_of_github_isse: Link_of_the_github_issue_created_in_first_challenge +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge --- ``` 3. After making this change create a commit with a proper commit message and push the changes From 725dc2732dedd4c739f1a114149a96454fae02f9 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 7 Sep 2022 11:51:57 +0530 Subject: [PATCH 26/50] Create challenge_7.md Signed-off-by: shubhansu-kr --- Challenges/challenge_7.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Challenges/challenge_7.md diff --git a/Challenges/challenge_7.md b/Challenges/challenge_7.md new file mode 100644 index 000000000..fe5cfb0bf --- /dev/null +++ b/Challenges/challenge_7.md @@ -0,0 +1,9 @@ +## Welcome to Challenge 7 + +Welcome to the seventh challenge! +Today's goal is to implement the squashing of the git commits. Squashing is used to combine multiple commits into one. This is done using the interactive mode of Git Rebase command. +In the [6th Challenge](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_6.md?plain=1) all of you created an additional commit to update the markdown file. +So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge. + +Task: +1. Using the interactive mode of Git Rebase command combine the multiple commits created in your Pull requests and then push that to the Pull request you have created in the previous challenges. From cce807e813c12d34ad8728df70719bf1e293db7b Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:19 +0530 Subject: [PATCH 27/50] Create challenge_8.md Signed-off-by: shubhansu-kr --- Challenges/challenge_8.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_8.md diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md new file mode 100644 index 000000000..3647ad565 --- /dev/null +++ b/Challenges/challenge_8.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 8 + +Welcome to the 8th challenge! + +Today's challenge is simple. But along side the task, please give the [following article](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) a read, as this will be used in Challenge 9. + + +Task: +1. Inside the branch you created during the prior challenges in your forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markwdown file and push the change + +2. Ensure the change appears in the Pull request. From 1e65ebcbcc094cef6ae776beba293f6a3a35e75f Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:39 +0530 Subject: [PATCH 28/50] Update challenge_8.md Signed-off-by: shubhansu-kr --- Challenges/challenge_8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md index 3647ad565..a143bd663 100644 --- a/Challenges/challenge_8.md +++ b/Challenges/challenge_8.md @@ -8,4 +8,4 @@ Today's challenge is simple. But along side the task, please give the [following Task: 1. Inside the branch you created during the prior challenges in your forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markwdown file and push the change -2. Ensure the change appears in the Pull request. +2. Ensure the change appears in the Pull request created in previous challenges From 77031f40ba94aa58a3fabb8de7f5c271dab8d1b1 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 9 Sep 2022 11:27:55 +0530 Subject: [PATCH 29/50] Create challenge_9.md Signed-off-by: shubhansu-kr --- Challenges/challenge_9.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge_9.md diff --git a/Challenges/challenge_9.md b/Challenges/challenge_9.md new file mode 100644 index 000000000..895473b94 --- /dev/null +++ b/Challenges/challenge_9.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 9 + +Welcome to the ninth challenge! + +Today's task is a continuation of yesterday's task [Task 8](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_8.md?plain=1). + +Yesterday the task was to create an additional commit in your branch. And today's focus will be to remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. + +This can be done by using the following command: ``git reset`` + +Here is an article you can refer to for understanding how git reset works: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset#:~:text=a%20shared%20repository.-,Summary,Index%2C%20and%20the%20Working%20Directory. + +So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. + + +Task: +1. Identify the commit id that needs to be removed (you should have created this in the 8th Challenge) +2. Use git reset and force push, to remove the commit from your pull request. +3. Share a screenshot of this, in the issue you created in previous challenges. From 4e80189ebc9ad1d272c512d2fb7cedf6584201d0 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 10 Sep 2022 09:52:15 +0530 Subject: [PATCH 30/50] Create challenge_10.md Signed-off-by: shubhansu-kr --- Challenges/challenge_10.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Challenges/challenge_10.md diff --git a/Challenges/challenge_10.md b/Challenges/challenge_10.md new file mode 100644 index 000000000..bbe1a7709 --- /dev/null +++ b/Challenges/challenge_10.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. + +A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. + +You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) + +Task: +1. Setup the ability to sign commits locally in your systems +2. Whenever committing in the future always try to use signed commits +3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``yourusername.md`` file: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +your_favroite_programming_language: Add your favorite programming language here +--- +``` From de2e125527dd84ba27d6cf631285f0a3aa613d6c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 11 Sep 2022 15:49:34 +0530 Subject: [PATCH 31/50] Create challenge_11.md Signed-off-by: shubhansu-kr --- Challenges/challenge_11.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Challenges/challenge_11.md diff --git a/Challenges/challenge_11.md b/Challenges/challenge_11.md new file mode 100644 index 000000000..fa1527fa9 --- /dev/null +++ b/Challenges/challenge_11.md @@ -0,0 +1,9 @@ +## Welcome to Challenge 11 + +Welcome to the 11th challenge! + +Today's challenge is simple. + +Task: +1. Create another branch from your current branch created in previous challenges (Don't create a new branch from main). +2. Share screenshot of this new branch in the issue created in previous challenge From ebe61d0f3ade1e010d50e745fc78d456c5c90db8 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 12 Sep 2022 13:29:37 +0530 Subject: [PATCH 32/50] Create challenge_12.md Signed-off-by: shubhansu-kr --- Challenges/challenge_12.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Challenges/challenge_12.md diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md new file mode 100644 index 000000000..8835fee4d --- /dev/null +++ b/Challenges/challenge_12.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 12 + +Welcome to the 12th Challenge + +Today's challenge is a re-practice of the 7th Challenge (https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_7.md?plain=1) + +So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit susing git rebase in your local projects +2. Once done, try to squash the commits in your pull request in the Challenge repository +3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits. From 9c42849ce00fac3f6d932a17fe0bacee60545bf2 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 12 Sep 2022 13:30:14 +0530 Subject: [PATCH 33/50] Update challenge_12.md Signed-off-by: shubhansu-kr --- Challenges/challenge_12.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md index 8835fee4d..c08629ea4 100644 --- a/Challenges/challenge_12.md +++ b/Challenges/challenge_12.md @@ -9,6 +9,6 @@ So focus for this challenge will be to practice the ``git rebase`` command. We s Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ Task: -1. Practice git rebase, and how to squash commit susing git rebase in your local projects +1. Practice git rebase, and how to squash commit using git rebase in your local projects 2. Once done, try to squash the commits in your pull request in the Challenge repository 3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits. From ea80244003096171c51c4ce4bb1c713abc29a598 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:01 +0530 Subject: [PATCH 34/50] Create challenge_13.md Signed-off-by: shubhansu-kr --- Challenges/challenge_13.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Challenges/challenge_13.md diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md new file mode 100644 index 000000000..b683be82f --- /dev/null +++ b/Challenges/challenge_13.md @@ -0,0 +1,10 @@ +## Welcome to Challenge 13 + +Welcome to the 13th Challenge + +Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning) + +Task: +1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors//`` directory. +2. Use the git stash command to move these changes to the stash area +3. Remove the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge From d6212c70c3a94f183a65fc8883e96a7df9451f99 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:21 +0530 Subject: [PATCH 35/50] Update challenge_13.md Signed-off-by: shubhansu-kr --- Challenges/challenge_13.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md index b683be82f..9744d811a 100644 --- a/Challenges/challenge_13.md +++ b/Challenges/challenge_13.md @@ -7,4 +7,4 @@ Today's challenge involves how to use ``git stash`` command effectively. You can Task: 1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors//`` directory. 2. Use the git stash command to move these changes to the stash area -3. Remove the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge +3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge From f41fb224a04d0f6f179921a787f206b0259fbc22 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 14 Sep 2022 12:56:37 +0530 Subject: [PATCH 36/50] Create challenge_14.md Signed-off-by: shubhansu-kr --- Challenges/challenge_14.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_14.md diff --git a/Challenges/challenge_14.md b/Challenges/challenge_14.md new file mode 100644 index 000000000..8c9f97f81 --- /dev/null +++ b/Challenges/challenge_14.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 14 + +Welcome to the 14th Challenge + +Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts. + +As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create. + +Task: +1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it +2. Share appropriate screenshot in the issue created in the first challenge. From af10ecf87ee717335dcbc7c78941acbceb8c8c46 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:19:59 +0530 Subject: [PATCH 37/50] Challenge15 Signed-off-by: shubhansu-kr --- Challenges/challenge_15.md | 13 +++++++++++++ challengers-list.md | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 Challenges/challenge_15.md create mode 100644 challengers-list.md diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md new file mode 100644 index 000000000..4cb9c3beb --- /dev/null +++ b/Challenges/challenge_15.md @@ -0,0 +1,13 @@ +## Welcome to Challenge 15 + +Welcome to the 15th Challenge + +In this 2 part challenge, we will try to emulate and fix merge conflicts via git. + +Task: +1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository + +2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. + +3. Push your change to reflect in the Pull Request created in previous challenges + diff --git a/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..47394f4f2 --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,3 @@ +# List of challengers +1. [Mrinal](https://github.com/mrinal1224) +2. [Shivay](https://github.com/shivaylamba) From 285b70253ecbf6eab4d2a4637e0a60eb9185b877 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:20:29 +0530 Subject: [PATCH 38/50] small update Signed-off-by: shubhansu-kr --- Challenges/challenge_15.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md index 4cb9c3beb..5e12e937a 100644 --- a/Challenges/challenge_15.md +++ b/Challenges/challenge_15.md @@ -4,6 +4,8 @@ Welcome to the 15th Challenge In this 2 part challenge, we will try to emulate and fix merge conflicts via git. +Today is the first part of this challenge: + Task: 1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository From aaa6947c76df4e0c678d92ad597b32434873c25f Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:22:33 +0530 Subject: [PATCH 39/50] Updated Challenger's list Signed-off-by: shubhansu-kr --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 47394f4f2..22b49300d 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,4 @@ # List of challengers 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) +3. [shubhansu-kr](https://github.com/shubhansu-kr) \ No newline at end of file From 56c78707512d3dd666e5ba7c120b491a2f432c96 Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Thu, 15 Sep 2022 20:27:46 +0530 Subject: [PATCH 40/50] Merge conflict Signed-off-by: shubhansu-kr --- Challenges/challenge_5.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 3053335a2..789b01f2c 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,6 +1,10 @@ ## Welcome to Challenge 5 +<<<<<<< HEAD Welcome to the fifth challenge! +======= +Welcome to the fourth challenge! +>>>>>>> e5a28d5 (Challenge 5) Today's goal is to update your forked repository and then create a Pull Request Task @@ -25,4 +29,8 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` +<<<<<<< HEAD 5. Submit your Pull Request on the main challenge repo. +======= +5. Submit your Pull Request +>>>>>>> e5a28d5 (Challenge 5) From f2804b50852933b45cd04cccf23354cb1e289e97 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Sat, 17 Sep 2022 19:26:07 +0530 Subject: [PATCH 41/50] created github desktop file --- githubDesktop.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 githubDesktop.md diff --git a/githubDesktop.md b/githubDesktop.md new file mode 100644 index 000000000..54d6d8ad0 --- /dev/null +++ b/githubDesktop.md @@ -0,0 +1,4 @@ +# Github Desktop + +With GitHub Desktop, you can interact with GitHub using a GUI instead of the command line or a web browser. You can use GitHub Desktop to complete most Git commands from your desktop, such as pushing to, pulling from, and cloning remote repositories, attributing commits, and creating pull requests, with visual confirmation of changes. + From 6fcd0a88bddbfbae35ae509e0821c748a4305cca Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Sun, 18 Sep 2022 17:44:33 +0530 Subject: [PATCH 42/50] Challenge18: Create-gist-solution Signed-off-by: Shubhansu kumar --- gist-solutions.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 gist-solutions.md diff --git a/gist-solutions.md b/gist-solutions.md new file mode 100644 index 000000000..0fe3bd33d --- /dev/null +++ b/gist-solutions.md @@ -0,0 +1,5 @@ + + +1. Create a gist writing on any software development related topic that interests you : [https://gist.github.com/shubhansu-kr/dac3d5820aa9f2aae39914fa2bd8c627](https://gist.github.com/shubhansu-kr/dac3d5820aa9f2aae39914fa2bd8c627) + +2. Create a gist sharing a small code snippet in your preferred programming language : [https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1](https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1) \ No newline at end of file From b086b5a7032d6396f76542da1b23f8f504984116 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 19:47:55 +0530 Subject: [PATCH 43/50] Added challenge19 source code Signed-off-by: Shubhansu kumar --- contributors/shubhansu-kr/Challenge19.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 contributors/shubhansu-kr/Challenge19.js diff --git a/contributors/shubhansu-kr/Challenge19.js b/contributors/shubhansu-kr/Challenge19.js new file mode 100644 index 000000000..e915573e1 --- /dev/null +++ b/contributors/shubhansu-kr/Challenge19.js @@ -0,0 +1,5 @@ +let greet = () => { + console.log('Hello Scaler'); +} + +setInterval(greet, 1000); \ No newline at end of file From d29745ef1e80d45ae9760180ed78a68bc03495fe Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 19:58:37 +0530 Subject: [PATCH 44/50] Linted js file Signed-off-by: Shubhansu kumar --- contributors/shubhansu-kr/Challenge19.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contributors/shubhansu-kr/Challenge19.js b/contributors/shubhansu-kr/Challenge19.js index e915573e1..551e5767f 100644 --- a/contributors/shubhansu-kr/Challenge19.js +++ b/contributors/shubhansu-kr/Challenge19.js @@ -1,5 +1,5 @@ -let greet = () => { - console.log('Hello Scaler'); +const greet = () => { + console.log('Hello Scaler') } -setInterval(greet, 1000); \ No newline at end of file +setInterval(greet, 1000) From 033adf4e9b9298d1128a0a27f6778c17341ae605 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 20:14:07 +0530 Subject: [PATCH 45/50] Added linters Signed-off-by: Shubhansu kumar --- Challenges/challenge_1.md | 12 ++++++------ Challenges/challenge_2.md | 17 ++++++++++------- Challenges/challenge_3.md | 9 ++++++--- Challenges/challenge_4.md | 9 ++++++--- Challenges/challenge_5.md | 21 ++++++++++++--------- challengers-list.md | 2 +- contributors/shubhansu-kr/Challenge13.md | 17 ++++++----------- gist-solutions.md | 4 ++-- githubDesktop.md | 3 +-- 9 files changed, 50 insertions(+), 44 deletions(-) diff --git a/Challenges/challenge_1.md b/Challenges/challenge_1.md index ca104e9bf..9bf7c2212 100644 --- a/Challenges/challenge_1.md +++ b/Challenges/challenge_1.md @@ -1,12 +1,12 @@ -## Welcome to Challenge 1 +# Welcome to Challenge 1 -Welcome to the first challenge! -We will start off with an easy task. +Welcome to the first challenge! +We will start off with an easy task. -Task: -Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue: +Task: +Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue: -``` +```text name: Add your name here github_user_name: add your github username here ``` diff --git a/Challenges/challenge_2.md b/Challenges/challenge_2.md index ebf050b64..13fdb800e 100644 --- a/Challenges/challenge_2.md +++ b/Challenges/challenge_2.md @@ -1,11 +1,14 @@ -## Welcome to Challenge 2 +# Welcome to Challenge 2 -Welcome to the second challenge! +Welcome to the second challenge! Today we will focus on how to fork and create a clone of a Github repository -Task: -1. Create a fork of this repository -2. Clone the forked project locally in your system using the ``git clone`` command -3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: -- URL of your forked repository +Task: + +1. Create a fork of this repository +2. Clone the forked project locally in your system using the ``git clone`` command + +3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: + +- URL of your forked repository - A screenshot of the cloned project in your system diff --git a/Challenges/challenge_3.md b/Challenges/challenge_3.md index 835579e1c..75aa5f02e 100644 --- a/Challenges/challenge_3.md +++ b/Challenges/challenge_3.md @@ -1,10 +1,13 @@ -## Welcome to Challenge 3 +# Welcome to Challenge 3 -Welcome to the third challenge! +Welcome to the third challenge! Today we will focus on how to create a new branch in a git repository -Task: +Task: + 1. Following up on the [previous task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_2.md), create a new branch locally in your forked clone repository 2. The branch name should be as follows: ``your_github_username-details``. Example: ``shivaylamba-details`` + 3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: + - Screenshot showing the list of all the current branches inside of your forked clone repository diff --git a/Challenges/challenge_4.md b/Challenges/challenge_4.md index 42336996c..caff89e63 100644 --- a/Challenges/challenge_4.md +++ b/Challenges/challenge_4.md @@ -1,11 +1,14 @@ -## Welcome to Challenge 4 +# Welcome to Challenge 4 -Welcome to the fourth challenge! +Welcome to the fourth challenge! Today we cover how to Update Fork Repo From the Original Repo The main repository has been updated since the last fork that all of you created. The goal is to updated the forked repository with the changes made in the original repository. This can be done with the git command of ``git remote add upstream`` Task + 1. Update your forked repository locally with the content of the original repository for both the main branch and the branch that you created in Challenge 3 using the ``git remote add upstream`` command + 2. Once the changes in the forked repository and the original repository are synced in the git branch that you created in the 3rd Challenge, Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: -- Screenshot showing the latest repository contents \ No newline at end of file + +- Screenshot showing the latest repository contents diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 789b01f2c..5d4e2b658 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,36 +1,39 @@ -## Welcome to Challenge 5 +# Welcome to Challenge 5 -<<<<<<< HEAD -Welcome to the fifth challenge! +Welcome to the fifth challenge ======= -Welcome to the fourth challenge! ->>>>>>> e5a28d5 (Challenge 5) + +Welcome to the fourth challenge! + Today's goal is to update your forked repository and then create a Pull Request Task + 1. Ensure your forked repository is in sync with the latest changes in the main repository. Also ensure that the git branch that you created in Challenge 2 is also in sync with the latest changes 2. Create a new folder inside the `contributors` folder, and name it with your github username. It should look something like this `contributors//`. Ex. -``` +```text contributors/shivaylamba/ ``` 3. Create a markdown file in the folder you created following the naming convention for the file: `.md`. Ex. -``` +```text contributors/shivaylamba/shivaylamba.md ``` 4. Copy the following template into your file, delete the placeholder text and fill the information with yours. -``` +```text --- name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -<<<<<<< HEAD + 5. Submit your Pull Request on the main challenge repo. ======= + 5. Submit your Pull Request + >>>>>>> e5a28d5 (Challenge 5) diff --git a/challengers-list.md b/challengers-list.md index 9704cfe5d..dd8c252f3 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,6 +1,6 @@ # List of challengers + 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) 3. [shubhansu-kr](https://github.com/shubhansu-kr) 4. [Raghav](https://github.com/raghavdhingra) - diff --git a/contributors/shubhansu-kr/Challenge13.md b/contributors/shubhansu-kr/Challenge13.md index 2a9eb7c2e..93bec407d 100644 --- a/contributors/shubhansu-kr/Challenge13.md +++ b/contributors/shubhansu-kr/Challenge13.md @@ -1,11 +1,6 @@ -<<<<<<< HEAD -Making some random changes -to create a conflict -======= -Challenge14: Solve Merge Conflict -<<<<<<< HEAD ->>>>>>> d8575c4 (Updated challenge14) -======= ->>>>>>> mergerbranch - ->>>>>>> 8b2ee248e99590d49e5e50c1a14ededcc6c94702 +# HEAD + +aking some random changes +to create a conflict + +Challenge14: Solve Merge Conflict diff --git a/gist-solutions.md b/gist-solutions.md index 0fe3bd33d..456d4124f 100644 --- a/gist-solutions.md +++ b/gist-solutions.md @@ -1,5 +1,5 @@ - +# Challenge18: Create Gists 1. Create a gist writing on any software development related topic that interests you : [https://gist.github.com/shubhansu-kr/dac3d5820aa9f2aae39914fa2bd8c627](https://gist.github.com/shubhansu-kr/dac3d5820aa9f2aae39914fa2bd8c627) -2. Create a gist sharing a small code snippet in your preferred programming language : [https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1](https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1) \ No newline at end of file +2. Create a gist sharing a small code snippet in your preferred programming language : [https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1](https://gist.github.com/shubhansu-kr/5d2d940b6d5b2043ca422442b19767a1) diff --git a/githubDesktop.md b/githubDesktop.md index 54d6d8ad0..4666cce7f 100644 --- a/githubDesktop.md +++ b/githubDesktop.md @@ -1,4 +1,3 @@ -# Github Desktop +# Github Desktop With GitHub Desktop, you can interact with GitHub using a GUI instead of the command line or a web browser. You can use GitHub Desktop to complete most Git commands from your desktop, such as pushing to, pulling from, and cloning remote repositories, attributing commits, and creating pull requests, with visual confirmation of changes. - From d322a654b49a0a01a6e9a734c6d09d288f995bab Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 20:28:24 +0530 Subject: [PATCH 46/50] Linted code Signed-off-by: Shubhansu kumar --- Challenges/challenge_10.md | 34 ++++++++++++++++++---------------- Challenges/challenge_11.md | 9 +++++---- Challenges/challenge_12.md | 17 +++++++++-------- Challenges/challenge_13.md | 7 ++++--- Challenges/challenge_14.md | 15 ++++++++------- Challenges/challenge_15.md | 14 +++++++------- Challenges/challenge_16.md | 17 ++++++++--------- Challenges/challenge_5.md | 28 +++++++++++++--------------- Challenges/challenge_6.md | 32 ++++++++++++++++++-------------- Challenges/challenge_7.md | 13 +++++++------ Challenges/challenge_8.md | 6 +++--- Challenges/challenge_9.md | 16 ++++++++-------- 12 files changed, 108 insertions(+), 100 deletions(-) diff --git a/Challenges/challenge_10.md b/Challenges/challenge_10.md index bbe1a7709..b3c0573a5 100644 --- a/Challenges/challenge_10.md +++ b/Challenges/challenge_10.md @@ -1,22 +1,24 @@ -## Welcome to Challenge 10 +# Welcome to Challenge 10 -Welcome to the 10th challenge! +Welcome to the 10th challenge! -Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. +Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. -A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. +A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) -Task: -1. Setup the ability to sign commits locally in your systems -2. Whenever committing in the future always try to use signed commits -3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``yourusername.md`` file: -``` ---- -name: your_name -github_user_name: YOUR-GITHUB-USERNAME -url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge -your_favroite_programming_language: Add your favorite programming language here ---- -``` +Task: + +1. Setup the ability to sign commits locally in your systems +2. Whenever committing in the future always try to use signed commits +3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``yourusername.md`` file: + + ```text + --- + name: your_name + github_user_name: YOUR-GITHUB-USERNAME + url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge + your_favroite_programming_language: Add your favorite programming language here + --- + ``` diff --git a/Challenges/challenge_11.md b/Challenges/challenge_11.md index fa1527fa9..0ac5083e4 100644 --- a/Challenges/challenge_11.md +++ b/Challenges/challenge_11.md @@ -1,9 +1,10 @@ -## Welcome to Challenge 11 +# Welcome to Challenge 11 -Welcome to the 11th challenge! +Welcome to the 11th challenge! Today's challenge is simple. -Task: -1. Create another branch from your current branch created in previous challenges (Don't create a new branch from main). +Task: + +1. Create another branch from your current branch created in previous challenges (Don't create a new branch from main). 2. Share screenshot of this new branch in the issue created in previous challenge diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md index c08629ea4..9f7acc9dc 100644 --- a/Challenges/challenge_12.md +++ b/Challenges/challenge_12.md @@ -1,14 +1,15 @@ -## Welcome to Challenge 12 +# Welcome to Challenge 12 -Welcome to the 12th Challenge +Welcome to the 12th Challenge -Today's challenge is a re-practice of the 7th Challenge (https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_7.md?plain=1) +Today's challenge is a re-practice of the 7th Challenge () -So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again. +So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again. -Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: -Task: -1. Practice git rebase, and how to squash commit using git rebase in your local projects +Task: + +1. Practice git rebase, and how to squash commit using git rebase in your local projects 2. Once done, try to squash the commits in your pull request in the Challenge repository -3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits. +3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: and ensure to sign your commits. diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md index 9744d811a..9a96d6c98 100644 --- a/Challenges/challenge_13.md +++ b/Challenges/challenge_13.md @@ -1,10 +1,11 @@ -## Welcome to Challenge 13 +# Welcome to Challenge 13 -Welcome to the 13th Challenge +Welcome to the 13th Challenge Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning) -Task: +Task: + 1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors//`` directory. 2. Use the git stash command to move these changes to the stash area 3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge diff --git a/Challenges/challenge_14.md b/Challenges/challenge_14.md index 8c9f97f81..00db83258 100644 --- a/Challenges/challenge_14.md +++ b/Challenges/challenge_14.md @@ -1,11 +1,12 @@ -## Welcome to Challenge 14 +# Welcome to Challenge 14 -Welcome to the 14th Challenge +Welcome to the 14th Challenge -Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts. +Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts. -As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create. +As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create. -Task: -1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it -2. Share appropriate screenshot in the issue created in the first challenge. +Task: + +1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve i +2. Share appropriate screenshot in the issue created in the first challenge. diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md index 5e12e937a..2f174defd 100644 --- a/Challenges/challenge_15.md +++ b/Challenges/challenge_15.md @@ -1,15 +1,15 @@ -## Welcome to Challenge 15 +# Welcome to Challenge 15 -Welcome to the 15th Challenge +Welcome to the 15th Challenge -In this 2 part challenge, we will try to emulate and fix merge conflicts via git. +In this 2 part challenge, we will try to emulate and fix merge conflicts via git. -Today is the first part of this challenge: +Today is the first part of this challenge: + +Task: -Task: 1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository -2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. +2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. 3. Push your change to reflect in the Pull Request created in previous challenges - diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md index 6d89c448d..25db0e580 100644 --- a/Challenges/challenge_16.md +++ b/Challenges/challenge_16.md @@ -1,14 +1,13 @@ -## Welcome to Challenge 16 +# Welcome to Challenge 16 -Welcome to the 16th Challenge +Welcome to the 16th Challenge -In this 2 part challenge, we will try to emulate and fix merge conflicts via git. +In this 2 part challenge, we will try to emulate and fix merge conflicts via git. -Today is the second and final part of this challenge: +Today is the second and final part of this challenge: -Task: -1. You will notice that your pull request will have a conflict: image +Task: -2. Try to resolve this merge conflict using local git - -3. Once resolved, share screenshot on the github issue created in the previous challenges \ No newline at end of file +1. You will notice that your pull request will have a conflict: +2. Try to resolve this merge conflict using local git +3. Once resolved, share screenshot on the github issue created in the previous challenges diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 5d4e2b658..336cb9623 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,7 +1,6 @@ # Welcome to Challenge 5 Welcome to the fifth challenge -======= Welcome to the fourth challenge! @@ -12,28 +11,27 @@ Task 1. Ensure your forked repository is in sync with the latest changes in the main repository. Also ensure that the git branch that you created in Challenge 2 is also in sync with the latest changes 2. Create a new folder inside the `contributors` folder, and name it with your github username. It should look something like this `contributors//`. Ex. -```text -contributors/shivaylamba/ -``` + ```text + contributors/shivaylamba/ + ``` 3. Create a markdown file in the folder you created following the naming convention for the file: `.md`. Ex. -```text -contributors/shivaylamba/shivaylamba.md -``` + ```text + contributors/shivaylamba/shivaylamba.md + ``` 4. Copy the following template into your file, delete the placeholder text and fill the information with yours. -```text ---- -name: your_name -github_user_name: YOUR-GITHUB-USERNAME ---- -``` + ```text + --- + name: your_name + github_user_name: YOUR-GITHUB-USERNAME + --- + ``` 5. Submit your Pull Request on the main challenge repo. -======= -5. Submit your Pull Request +6. Submit your Pull Request >>>>>>> e5a28d5 (Challenge 5) diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index 701d59f78..f87ec55d0 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -1,19 +1,23 @@ -## Welcome to Challenge 6 +# Welcome to Challenge 6 -Welcome to the sixth challenge! +Welcome to the sixth challenge! Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) Task -1. Create a new commit in the branch you created in Challenge 2 in your forked repository -2. The change that you have to make should be the following: -In the markdown file that was created in Challenge 5, edit the details as follows: -``` ---- -name: your_name -github_user_name: YOUR-GITHUB-USERNAME -url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge ---- -``` -3. After making this change create a commit with a proper commit message and push the changes -4. Check if the commit reflects in the Pull request you created in Challenge 5 +1. Create a new commit in the branch you created in Challenge 2 in your forked repository + +2. The change that you have to make should be the following: +In the markdown file that was created in Challenge 5, edit the details as follows: + + ```text + --- + name: your_name + github_user_name: YOUR-GITHUB-USERNAME + url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge + --- + ``` + +3. After making this change create a commit with a proper commit message and push the changes + +4. Check if the commit reflects in the Pull request you created in Challenge 5 diff --git a/Challenges/challenge_7.md b/Challenges/challenge_7.md index fe5cfb0bf..d6bbe8e84 100644 --- a/Challenges/challenge_7.md +++ b/Challenges/challenge_7.md @@ -1,9 +1,10 @@ -## Welcome to Challenge 7 +# Welcome to Challenge 7 -Welcome to the seventh challenge! +Welcome to the seventh challenge! Today's goal is to implement the squashing of the git commits. Squashing is used to combine multiple commits into one. This is done using the interactive mode of Git Rebase command. -In the [6th Challenge](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_6.md?plain=1) all of you created an additional commit to update the markdown file. -So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge. +In the [6th Challenge](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_6.md?plain=1) all of you created an additional commit to update the markdown file. +So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge. -Task: -1. Using the interactive mode of Git Rebase command combine the multiple commits created in your Pull requests and then push that to the Pull request you have created in the previous challenges. +Task: + +1. Using the interactive mode of Git Rebase command combine the multiple commits created in your Pull requests and then push that to the Pull request you have created in the previous challenges. diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md index a143bd663..98642cbb3 100644 --- a/Challenges/challenge_8.md +++ b/Challenges/challenge_8.md @@ -1,11 +1,11 @@ -## Welcome to Challenge 8 +# Welcome to Challenge 8 -Welcome to the 8th challenge! +Welcome to the 8th challenge! Today's challenge is simple. But along side the task, please give the [following article](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) a read, as this will be used in Challenge 9. +Task: -Task: 1. Inside the branch you created during the prior challenges in your forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markwdown file and push the change 2. Ensure the change appears in the Pull request created in previous challenges diff --git a/Challenges/challenge_9.md b/Challenges/challenge_9.md index 895473b94..2bf004eb1 100644 --- a/Challenges/challenge_9.md +++ b/Challenges/challenge_9.md @@ -1,19 +1,19 @@ -## Welcome to Challenge 9 +# Welcome to Challenge 9 -Welcome to the ninth challenge! +Welcome to the ninth challenge! Today's task is a continuation of yesterday's task [Task 8](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_8.md?plain=1). -Yesterday the task was to create an additional commit in your branch. And today's focus will be to remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. +Yesterday the task was to create an additional commit in your branch. And today's focus will be to remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. This can be done by using the following command: ``git reset`` -Here is an article you can refer to for understanding how git reset works: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset#:~:text=a%20shared%20repository.-,Summary,Index%2C%20and%20the%20Working%20Directory. +Here is an article you can refer to for understanding how git reset works: . -So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. +So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. +Task: -Task: 1. Identify the commit id that needs to be removed (you should have created this in the 8th Challenge) -2. Use git reset and force push, to remove the commit from your pull request. -3. Share a screenshot of this, in the issue you created in previous challenges. +2. Use git reset and force push, to remove the commit from your pull request. +3. Share a screenshot of this, in the issue you created in previous challenges. From 8c962c4022dfe77bfae8f0b1f8388fb29929d868 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 20:31:01 +0530 Subject: [PATCH 47/50] Linted code Signed-off-by: Shubhansu kumar --- CONTRIBUTING.md | 5 +++-- README.md | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5ed6b25df..ecf7ca149 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,10 @@ -## Contributing Guidelines +# Contributing Guidelines Thank you for considering contributing to the repository. This guide details all the general information that one should know before contributing to the project. Please stick as close as possible to the guidelines. That way we ensure that you have a smooth experience contributing to this project. -### General Rules : +## General Rules + These are in general rules that you should be following while contributing to an Open Source project : - Be Nice, Be Respectful (BNBR) diff --git a/README.md b/README.md index 6c03e71e7..169826f43 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,22 @@ # Scaler September Open Source Challenge - + ## What is the Scaler September Open Source Challenge? + Link for [Notion page](https://scalerdiscord.notion.site/scalerdiscord/Open-Source-September-Scaler-Discord-Community-f9306c7dc15a464ba1b6ea7ee30cdf0d). -Every day throughout September, for those who have enrolled, we will share one task.  +Every day throughout September, for those who have enrolled, we will share one task. Participants will need to use their knowledge of Git and Github for each task, and the difficulty level of the tasks will rise daily. The primary objective? To help the community become better at contributing to open source and building projects. ## Learning Outcomes + 1. Learn how to contribute to open source projects. Learn the basics of creating issues, pull requests, Git and Github 2. Celebrate with new rewards every time you reach a milestone! @@ -22,34 +24,37 @@ The primary objective? To help the community become better at contributing to op ### Step 1 -Accept the challenge by filling out this form: [https://bit.ly/opensourcesepbyscaler](https://bit.ly/opensourcesepbyscaler) +Accept the challenge by filling out this form: [https://bit.ly/opensourcesepbyscaler](https://bit.ly/opensourcesepbyscaler) ### Step 2 -If you haven't already, create an account on Github, and brush up on your skills in Git and Github. +If you haven't already, create an account on Github, and brush up on your skills in Git and Github. ### Step 3 -Head to the official [Scaler Open Source challenge repository](https://github.com/scaleracademy/scaler-september-open-source-challenge/). Star it. +Head to the official [Scaler Open Source challenge repository](https://github.com/scaleracademy/scaler-september-open-source-challenge/). Star it. -Keep track of the README, as a new task will be added every day. +Keep track of the README, as a new task will be added every day. -Please go through the task for that day and solve it. +Please go through the task for that day and solve it. ### Step 4 Don't forget to share your progress within the community if you want those rewards! -## Prizes +### Prizes + Consistency is what we're after. As a result, we have several levels or awards based on how consistently you complete the assignments. You won't be qualified for the remaining tasks of the challenge if you are unable to complete and submit a task on any given day. Here is the reward [tier list](https://scalerdiscord.notion.site/3eabe9a1900c4b8685ae55acb5c33cbe?v=001e8d4c287f4d96bae935c5d45de521). ## Contact Us + For all communications and queries, you can join our [Discord Server](https://discord.com/invite/scaler). ## Resources + 1. Launch Video for the September Challenge: [Guide to Github and the Open Source Challenge](https://youtu.be/70nx_YxE56Q) 2. Git Tutorial: [Full Git Tutorial](https://www.youtube.com/watch?v=ZtfZGVQWjew) 3. Find good first issues to contribute to: [Good First issues](https://goodfirstissue.dev/) From 75a1bc1f9965ad9cfce1f170eca8cf85552b4223 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Mon, 19 Sep 2022 20:46:03 +0530 Subject: [PATCH 48/50] Added linter Signed-off-by: Shubhansu kumar --- Challenges/challenge_13.md | 2 +- Challenges/challenge_15.md | 2 +- Challenges/challenge_16.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md index 9a96d6c98..27a3540eb 100644 --- a/Challenges/challenge_13.md +++ b/Challenges/challenge_13.md @@ -8,4 +8,4 @@ Task: 1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors//`` directory. 2. Use the git stash command to move these changes to the stash area -3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge +3. Delete the content from the stash area and share a screenshot of this inside the GitHub issue you created in the first challenge diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md index 2f174defd..dbd4ef74d 100644 --- a/Challenges/challenge_15.md +++ b/Challenges/challenge_15.md @@ -8,7 +8,7 @@ Today is the first part of this challenge: Task: -1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository +1. Update your Forked repository From the Original repository. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository 2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md index 25db0e580..8ed9594f9 100644 --- a/Challenges/challenge_16.md +++ b/Challenges/challenge_16.md @@ -10,4 +10,4 @@ Task: 1. You will notice that your pull request will have a conflict: 2. Try to resolve this merge conflict using local git -3. Once resolved, share screenshot on the github issue created in the previous challenges +3. Once resolved, share screenshot on the GitHub issue created in the previous challenges From 7c3a079a52490cffa507ea3ee741d45450fbe934 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Wed, 21 Sep 2022 19:27:19 +0530 Subject: [PATCH 49/50] Some randon commit Signed-off-by: Shubhansu kumar --- githubDesktop.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/githubDesktop.md b/githubDesktop.md index 4666cce7f..a6e1eabb3 100644 --- a/githubDesktop.md +++ b/githubDesktop.md @@ -1,3 +1,5 @@ # Github Desktop With GitHub Desktop, you can interact with GitHub using a GUI instead of the command line or a web browser. You can use GitHub Desktop to complete most Git commands from your desktop, such as pushing to, pulling from, and cloning remote repositories, attributing commits, and creating pull requests, with visual confirmation of changes. + +some edit From b1fcf85038a9e34f21e5cdae5ac4584d215b2ec5 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Thu, 22 Sep 2022 20:27:28 +0530 Subject: [PATCH 50/50] Added link Signed-off-by: Shubhansu kumar --- contributors/shubhansu-kr/shubhansu-kr.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors/shubhansu-kr/shubhansu-kr.md b/contributors/shubhansu-kr/shubhansu-kr.md index 4dd5e1d1e..7663eed20 100644 --- a/contributors/shubhansu-kr/shubhansu-kr.md +++ b/contributors/shubhansu-kr/shubhansu-kr.md @@ -3,4 +3,6 @@ name: Shubhansu kumar singh github_user_name: shubhansu-kr url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/292 your_favroite_programming_language: cpp +your_hosted_github_pages_link: https://shubhansu-kr.github.io/scalerChallenge/ +your_hosted_github_pages_repository_link: https://github.com/shubhansu-kr/scalerChallenge --- \ No newline at end of file