From 1dcfba86191f9bb1a7f81266efa2c0e58f6178b3 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 17:44:00 +0530 Subject: [PATCH 01/26] task 5 completed --- contributors/trapti77/trapti77.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/trapti77/trapti77.md diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md new file mode 100644 index 000000000..8a178f1aa --- /dev/null +++ b/contributors/trapti77/trapti77.md @@ -0,0 +1,2 @@ +name-trapti patel +github-userid-trapti77 \ No newline at end of file From 7ad3c848807b8a47a82ac332239ae74879e3c649 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 18:22:36 +0530 Subject: [PATCH 02/26] day5task --- contributors/trapti77/trapti77-details | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/trapti77/trapti77-details diff --git a/contributors/trapti77/trapti77-details b/contributors/trapti77/trapti77-details new file mode 100644 index 000000000..682d2f2d0 --- /dev/null +++ b/contributors/trapti77/trapti77-details @@ -0,0 +1,2 @@ +name-trapti patel +github-usename-trapti77 From 24b7f1c277e047d88afdde67cf9041fdb18081c2 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 18:23:39 +0530 Subject: [PATCH 03/26] add md --- contributors/trapti77/{trapti77-details => trapti77-details.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename contributors/trapti77/{trapti77-details => trapti77-details.md} (100%) diff --git a/contributors/trapti77/trapti77-details b/contributors/trapti77/trapti77-details.md similarity index 100% rename from contributors/trapti77/trapti77-details rename to contributors/trapti77/trapti77-details.md From a56e54d4d34cfe5c32c7554eb8432e57e0a00003 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 18:25:52 +0530 Subject: [PATCH 04/26] task5 --- contributors/trapti77/{trapti77-details.md => trapti77.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename contributors/trapti77/{trapti77-details.md => trapti77.md} (100%) diff --git a/contributors/trapti77/trapti77-details.md b/contributors/trapti77/trapti77.md similarity index 100% rename from contributors/trapti77/trapti77-details.md rename to contributors/trapti77/trapti77.md From a7d682f055de55ad78eed0ebac819e191cfc5592 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 21:51:45 +0530 Subject: [PATCH 05/26] add url of github issue --- contributors/trapti77/trapti77.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 682d2f2d0..cc15bdfb5 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -1,2 +1,3 @@ -name-trapti patel -github-usename-trapti77 +name:trapti patel +github-user_name:trapti77 +url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 \ No newline at end of file From 389813fcd5872aabdd274565406a77b4d67a0d58 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Thu, 7 Sep 2023 22:07:09 +0530 Subject: [PATCH 06/26] add url of github issue of first challeng --- contributors/trapti77/trapti77.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index cc15bdfb5..20c787ec3 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -1,3 +1,5 @@ name:trapti patel +
github-user_name:trapti77 +
url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 \ No newline at end of file From 37adc70a3ef909c6d972e48daa9773a5549dafe7 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Fri, 8 Sep 2023 11:35:03 +0530 Subject: [PATCH 07/26] merge new branch --- scaler-open-source-september-challenge | 1 + 1 file changed, 1 insertion(+) create mode 160000 scaler-open-source-september-challenge diff --git a/scaler-open-source-september-challenge b/scaler-open-source-september-challenge new file mode 160000 index 000000000..389813fcd --- /dev/null +++ b/scaler-open-source-september-challenge @@ -0,0 +1 @@ +Subproject commit 389813fcd5872aabdd274565406a77b4d67a0d58 From 738997ef055bf950f165529951c7ace04efb7ab5 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Fri, 8 Sep 2023 11:37:51 +0530 Subject: [PATCH 08/26] merge new file --- scaler-open-source-september-challenge | 1 + 1 file changed, 1 insertion(+) create mode 160000 scaler-open-source-september-challenge diff --git a/scaler-open-source-september-challenge b/scaler-open-source-september-challenge new file mode 160000 index 000000000..389813fcd --- /dev/null +++ b/scaler-open-source-september-challenge @@ -0,0 +1 @@ +Subproject commit 389813fcd5872aabdd274565406a77b4d67a0d58 From 0d1f6931463f792909567e5900e9bf6f163e3051 Mon Sep 17 00:00:00 2001 From: trapti77 Date: Fri, 8 Sep 2023 11:54:46 +0530 Subject: [PATCH 09/26] add url of github issue --- contributors/trapti77/trapti77.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 contributors/trapti77/trapti77.md diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md new file mode 100644 index 000000000..97ecfedcc --- /dev/null +++ b/contributors/trapti77/trapti77.md @@ -0,0 +1,5 @@ +Name:trapti patel +
+github_user_name:trapti77 +
+url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 \ No newline at end of file From 74f0f638fb73e9fa696e2ed581e0fdafa456cdfd Mon Sep 17 00:00:00 2001 From: trapti77 Date: Sun, 10 Sep 2023 23:48:43 +0530 Subject: [PATCH 10/26] add new file type of md --- contributors/trapti77_2.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 contributors/trapti77_2.md diff --git a/contributors/trapti77_2.md b/contributors/trapti77_2.md new file mode 100644 index 000000000..e69de29bb From 3b69c6770cce66c7fb92baee5ca6b542a7104a0e Mon Sep 17 00:00:00 2001 From: trapti77 Date: Mon, 11 Sep 2023 00:52:03 +0530 Subject: [PATCH 11/26] reset message --- contributors/trapti77_2.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributors/trapti77_2.md b/contributors/trapti77_2.md index e69de29bb..7dda129a9 100644 --- a/contributors/trapti77_2.md +++ b/contributors/trapti77_2.md @@ -0,0 +1,4 @@ +My name is trapti patel. +I am very exited that i am contribute at scaler-open-source-september-challenges. +I have done my 6 challenges and this is my 7th challenges that I try to complete +quickly. \ No newline at end of file From b481f391a67c80d5949ed98396a73556f4fbd59e Mon Sep 17 00:00:00 2001 From: trapti77 Date: Mon, 11 Sep 2023 20:39:49 +0530 Subject: [PATCH 12/26] task 10 completed --- contributors/trapti77/trapti77.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 97ecfedcc..83fe97dd5 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -2,4 +2,5 @@ Name:trapti patel
github_user_name:trapti77
-url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 \ No newline at end of file +url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 +this is task 10 \ No newline at end of file From 45058c16257f831ab4a0aada6554c7cb1f4afea0 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Mon, 11 Sep 2023 11:15:18 +0530 Subject: [PATCH 13/26] combining 10th task task 10 completed --- Challenges/challenge11.md | 11 +++++++++++ contributors/trapti77/trapti77.md | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Challenges/challenge11.md diff --git a/Challenges/challenge11.md b/Challenges/challenge11.md new file mode 100644 index 000000000..724b4a01c --- /dev/null +++ b/Challenges/challenge11.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 11 + +Welcome to the 11th 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 (challenge 3) ``your_github_username-details`` create a new file inside the directory ``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/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 97ecfedcc..83fe97dd5 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -2,4 +2,5 @@ Name:trapti patel
github_user_name:trapti77
-url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 \ No newline at end of file +url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 +this is task 10 \ No newline at end of file From 3e57991aec97dab7ed38fcd14d861d4448999f87 Mon Sep 17 00:00:00 2001 From: trapti patel Date: Tue, 12 Sep 2023 22:59:28 +0530 Subject: [PATCH 14/26] signed commit --- contributors/trapti77/trapti77.md | 1 - 1 file changed, 1 deletion(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 83fe97dd5..caebac4b0 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -3,4 +3,3 @@ Name:trapti patel github_user_name:trapti77
url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 -this is task 10 \ No newline at end of file From 6a1df6c295d5e88da6d83bb6053cadccd491337f Mon Sep 17 00:00:00 2001 From: trapti patel Date: Thu, 14 Sep 2023 06:51:28 +0530 Subject: [PATCH 15/26] first gist solutin file --- contributors/trapti77/gist-solution.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/trapti77/gist-solution.md diff --git a/contributors/trapti77/gist-solution.md b/contributors/trapti77/gist-solution.md new file mode 100644 index 000000000..1b0d21467 --- /dev/null +++ b/contributors/trapti77/gist-solution.md @@ -0,0 +1,2 @@ + +gist solution development link : From 8334be130fca46059ec189fb5ac71b5fa29236dc Mon Sep 17 00:00:00 2001 From: trapti patel Date: Thu, 14 Sep 2023 22:26:47 +0530 Subject: [PATCH 16/26] make changes agaun --- contributors/trapti77/trapti77.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 2dfdbec38..6060ca143 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -4,4 +4,4 @@ github_user_name:trapti77
url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
-your_favroite_programming_language:c++ \ No newline at end of file +your_favroite_programming_language:c++ and python. From 9aec93f635b6e2e30884f5252f108ee24f0f72ec Mon Sep 17 00:00:00 2001 From: trapti patel Date: Fri, 15 Sep 2023 06:08:53 +0530 Subject: [PATCH 17/26] challage 14 commit --- contributors/trapti77/trapti77.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 6060ca143..ec7ea902e 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -5,3 +5,4 @@ github_user_name:trapti77 url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
your_favroite_programming_language:c++ and python. +I am doing changes bacause this is my 14 th task \ No newline at end of file From 7166229d7838d1c027e9303833237bd711d1d877 Mon Sep 17 00:00:00 2001 From: trapti patel Date: Fri, 15 Sep 2023 06:08:53 +0530 Subject: [PATCH 18/26] challage 14 commit From 5bf2b80e0e6059d4e8ac62e8fb2be1da5e68efda Mon Sep 17 00:00:00 2001 From: trapti patel Date: Fri, 15 Sep 2023 06:33:48 +0530 Subject: [PATCH 19/26] adding othe language --- contributors/trapti77/trapti77.md | 1 - 1 file changed, 1 deletion(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index ec7ea902e..6060ca143 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -5,4 +5,3 @@ github_user_name:trapti77 url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
your_favroite_programming_language:c++ and python. -I am doing changes bacause this is my 14 th task \ No newline at end of file From 6891f13c55d31a8971e4c5ef86228cae39cee187 Mon Sep 17 00:00:00 2001 From: trapti patel Date: Fri, 15 Sep 2023 06:35:36 +0530 Subject: [PATCH 20/26] add new commit --- contributors/trapti77/trapti77.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 6060ca143..42d41fe68 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -5,3 +5,4 @@ github_user_name:trapti77 url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
your_favroite_programming_language:c++ and python. +I also do wedevelopment that is very interested \ No newline at end of file From c0e573833c239bca56d78c40acf4858ce0972a9d Mon Sep 17 00:00:00 2001 From: trapti patel Date: Fri, 15 Sep 2023 07:47:44 +0530 Subject: [PATCH 21/26] signed commit in challenge 14 --- contributors/trapti77/trapti77.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 42d41fe68..5c5fae6d7 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -5,4 +5,4 @@ github_user_name:trapti77 url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
your_favroite_programming_language:c++ and python. -I also do wedevelopment that is very interested \ No newline at end of file +I also do webdevelopment that is very interested \ No newline at end of file From e14593867a9ff2191cefcebd9c6efca68bf72e20 Mon Sep 17 00:00:00 2001 From: trapti patel Date: Sat, 16 Sep 2023 20:22:56 +0530 Subject: [PATCH 22/26] merge_conflict --- merge_conflict_problem | 1 + 1 file changed, 1 insertion(+) create mode 160000 merge_conflict_problem diff --git a/merge_conflict_problem b/merge_conflict_problem new file mode 160000 index 000000000..684f16a33 --- /dev/null +++ b/merge_conflict_problem @@ -0,0 +1 @@ +Subproject commit 684f16a33e0445375a7967af3f3e2416d9e62bec From 15411ead7f84ffc11c6171256c496d11a829448a Mon Sep 17 00:00:00 2001 From: trapti patel Date: Sat, 16 Sep 2023 22:18:16 +0530 Subject: [PATCH 23/26] add name --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..e4ad5c221 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +1,3 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) +[trapti](https://github.com/trapti77) From d9c7540af075360f0af25972d4587647f58e22d0 Mon Sep 17 00:00:00 2001 From: trapti patel Date: Mon, 18 Sep 2023 18:57:22 +0530 Subject: [PATCH 24/26] add about github desktop --- challenge18/challenge18 | 1 + challenge18/main.text | 4 ++++ 2 files changed, 5 insertions(+) create mode 160000 challenge18/challenge18 create mode 100644 challenge18/main.text diff --git a/challenge18/challenge18 b/challenge18/challenge18 new file mode 160000 index 000000000..447c35fcf --- /dev/null +++ b/challenge18/challenge18 @@ -0,0 +1 @@ +Subproject commit 447c35fcfc25ca7cdfb4196e8924d06f75d8263e diff --git a/challenge18/main.text b/challenge18/main.text new file mode 100644 index 000000000..f06c6dbc9 --- /dev/null +++ b/challenge18/main.text @@ -0,0 +1,4 @@ +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 addbbaae3be4f5ed09c4805d7cc9ae4550e086fd Mon Sep 17 00:00:00 2001 From: trapti patel Date: Sun, 24 Sep 2023 00:41:53 +0530 Subject: [PATCH 25/26] resolve merge --- contributors/trapti77/trapti77.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 4b8c66f57..9878fb1f3 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD Name:trapti patel
github_user_name:trapti77 @@ -7,12 +6,3 @@ url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-septembe
your_favroite_programming_language:c++ and python. I also do webdevelopment that is very interested -======= -name-trapti patel -github-userid-trapti77 -name:trapti patel -
-github-user_name:trapti77 -
-url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817 ->>>>>>> origin/main From c9ad6378d506c9da7b6ec9beec5a0bff6dd982db Mon Sep 17 00:00:00 2001 From: trapti patel Date: Sun, 24 Sep 2023 00:49:17 +0530 Subject: [PATCH 26/26] add info about hosted project --- contributors/trapti77/trapti77.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contributors/trapti77/trapti77.md b/contributors/trapti77/trapti77.md index 9878fb1f3..770e8e79a 100644 --- a/contributors/trapti77/trapti77.md +++ b/contributors/trapti77/trapti77.md @@ -1,8 +1,9 @@ -Name:trapti patel +name:trapti patel
github_user_name:trapti77
url_of_github_issue:https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/502#issue-1879149817
your_favroite_programming_language:c++ and python. -I also do webdevelopment that is very interested +your_hosted_github_pages_link: https://trapti77.github.io/ +your_hosted_github_pages_repository_link:https://github.com/trapti77/trapti77.github.io