From f8d15d3aa3a815e5e8217d83f98dd19aeac63f78 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 7 Sep 2022 11:51:57 +0530 Subject: [PATCH 01/14] Create challenge_7.md Signed-off-by: Aman Ahmed Siddiqui --- 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 a8ac3d4b742fe483553847f64bf99494961b648c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:35:54 +0530 Subject: [PATCH 02/14] Completed Challenge 7 by squashing all commits related to Challenges 5 and 6 Signed-off-by: Aman Ahmed Siddiqui --- contributors/sid-am-ahd935/sid-am-ahd935.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 contributors/sid-am-ahd935/sid-am-ahd935.md diff --git a/contributors/sid-am-ahd935/sid-am-ahd935.md b/contributors/sid-am-ahd935/sid-am-ahd935.md new file mode 100644 index 000000000..c9bb7f6ca --- /dev/null +++ b/contributors/sid-am-ahd935/sid-am-ahd935.md @@ -0,0 +1,5 @@ +--- +name: Aman Ahmed Siddiqui +github_user_name: sid-am-ahd935 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/265 +--- From 3f8b604466a2b010cf0d35b36365ed6c1f085f67 Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Mon, 12 Sep 2022 19:35:40 +0530 Subject: [PATCH 03/14] Completed Challenge 12 Signed-off-by: Aman Ahmed Siddiqui --- Challenges/challenge_10.md | 22 +++++++++++++++++++++ Challenges/challenge_11.md | 9 +++++++++ Challenges/challenge_12.md | 14 +++++++++++++ Challenges/challenge_8.md | 11 +++++++++++ Challenges/challenge_9.md | 19 ++++++++++++++++++ contributors/sid-am-ahd935/sid-am-ahd935.md | 2 ++ 6 files changed, 77 insertions(+) create mode 100644 Challenges/challenge_10.md create mode 100644 Challenges/challenge_11.md create mode 100644 Challenges/challenge_12.md create mode 100644 Challenges/challenge_8.md create mode 100644 Challenges/challenge_9.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 +--- +``` 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 diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md new file mode 100644 index 000000000..c08629ea4 --- /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 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. diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md new file mode 100644 index 000000000..a143bd663 --- /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 created in previous challenges 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. diff --git a/contributors/sid-am-ahd935/sid-am-ahd935.md b/contributors/sid-am-ahd935/sid-am-ahd935.md index c9bb7f6ca..001074959 100644 --- a/contributors/sid-am-ahd935/sid-am-ahd935.md +++ b/contributors/sid-am-ahd935/sid-am-ahd935.md @@ -2,4 +2,6 @@ name: Aman Ahmed Siddiqui github_user_name: sid-am-ahd935 url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/265 +your_favourite_programming_language: Python + --- From 3812ffb75a1d3bc803c5f626bbff9f909c6f5f62 Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Wed, 14 Sep 2022 21:50:10 +0530 Subject: [PATCH 04/14] created initial file merge.txt Signed-off-by: Aman Ahmed Siddiqui --- merge-test/merge.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 merge-test/merge.txt diff --git a/merge-test/merge.txt b/merge-test/merge.txt new file mode 100644 index 000000000..f2376e2ba --- /dev/null +++ b/merge-test/merge.txt @@ -0,0 +1 @@ +initial content From 789eaae4c48cdde4c741c14cbda6e50d4b3b7994 Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Wed, 14 Sep 2022 21:51:52 +0530 Subject: [PATCH 05/14] merging conflict-creator-branch Signed-off-by: Aman Ahmed Siddiqui --- merge-test/merge.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/merge-test/merge.txt b/merge-test/merge.txt index f2376e2ba..7e8f7fbd7 100644 --- a/merge-test/merge.txt +++ b/merge-test/merge.txt @@ -1 +1,2 @@ initial content +adding new contents to original content From dc29a72b02ae8b1718308aad2e7dc97ba8073a91 Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Thu, 15 Sep 2022 23:50:58 +0530 Subject: [PATCH 06/14] Resolved Merge Conflict while rebasing during signoffs Signed-off-by: Aman Ahmed Siddiqui --- merge-test/merge.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/merge-test/merge.txt b/merge-test/merge.txt index 7e8f7fbd7..c695bc735 100644 --- a/merge-test/merge.txt +++ b/merge-test/merge.txt @@ -1,2 +1,3 @@ initial content adding new contents to original content +changing contents of merge.txt entirely for conflict From 979097a8bb10ba29084811c5bfe1ae76f37bd8c9 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:01 +0530 Subject: [PATCH 07/14] Create challenge_13.md Signed-off-by: Aman Ahmed Siddiqui --- 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 9eeccb69c1bf69fa1bed27f32c66a2be2581da24 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:21 +0530 Subject: [PATCH 08/14] Update challenge_13.md Signed-off-by: Aman Ahmed Siddiqui --- 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 3210c9093dba784233e95d3bb5a21a281172e7fd Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 14 Sep 2022 12:56:37 +0530 Subject: [PATCH 09/14] Create challenge_14.md Signed-off-by: Aman Ahmed Siddiqui --- 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 6592fd023707643b591d26a71d7f832c69eef2e4 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:19:59 +0530 Subject: [PATCH 10/14] Challenge15 Signed-off-by: Aman Ahmed Siddiqui --- 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 cf2b38f54f771e544216d9786aeac0ff2b3b445d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:20:29 +0530 Subject: [PATCH 11/14] small update Signed-off-by: Aman Ahmed Siddiqui --- 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 6924185b9638d078f4781609cfbf403bedddbdee Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Thu, 15 Sep 2022 23:40:59 +0530 Subject: [PATCH 12/14] Completed Challenge 15 Signed-off-by: Aman Ahmed Siddiqui --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 47394f4f2..0d956bd63 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. [Aman](https://github.com/sid-am-ahd935) From d03563f58a20ee469e39594840cfcb49357f14ee Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 16 Sep 2022 12:22:46 +0530 Subject: [PATCH 13/14] add challenge 16 Signed-off-by: Aman Ahmed Siddiqui --- Challenges/challenge_16.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Challenges/challenge_16.md diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md new file mode 100644 index 000000000..6d89c448d --- /dev/null +++ b/Challenges/challenge_16.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 16 + +Welcome to the 16th Challenge + +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: + +Task: +1. You will notice that your pull request will have a conflict: image + +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 From fad8b7aca5b25676c265924bbaffea3e5c49b1e8 Mon Sep 17 00:00:00 2001 From: Aman Ahmed Siddiqui Date: Tue, 20 Sep 2022 14:46:54 +0530 Subject: [PATCH 14/14] added demo code --- contributors/sid-am-ahd935/demo_code.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 contributors/sid-am-ahd935/demo_code.py diff --git a/contributors/sid-am-ahd935/demo_code.py b/contributors/sid-am-ahd935/demo_code.py new file mode 100644 index 000000000..2f9a147db --- /dev/null +++ b/contributors/sid-am-ahd935/demo_code.py @@ -0,0 +1 @@ +print("Hello")