From 6f491a8cf54dbcf39045cbff433e29bba3f48d28 Mon Sep 17 00:00:00 2001 From: Shubha Ruidas Date: Sat, 15 Apr 2023 01:26:19 +0530 Subject: [PATCH 1/4] (TASK-1) Add my name to README (Shubha Ruidas) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c74148..2e843eb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This file is written in the [Markdown format](https://guides.github.com/features ## Task 1 Add your name to this list below 'Entries'. - +git - **Fork the repo, create a new branch (called Task1), make changes and send a pull request** - [This article](https://help.github.com/articles/using-pull-requests/) should give you a good idea of what pull requests are how to use them. @@ -26,7 +26,7 @@ Your entry should maintain alphabetic order and it should be in the format: ### Entries - +Shubha Ruidas [shubha987] (http://github.com/shubha987) ## Task 2 After all of you send a Pull Request, I'll add my name to 'Entries'. From f30c5a681c37b45f193fc59eedadbe7e602d9eae Mon Sep 17 00:00:00 2001 From: Shubha Ruidas Date: Sat, 15 Apr 2023 01:45:44 +0530 Subject: [PATCH 2/4] MERGE UPSTREAM CHANGES --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e843eb..734c108 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Your entry should maintain alphabetic order and it should be in the format: ### Entries -Shubha Ruidas [shubha987] (http://github.com/shubha987) +"Shubha Ruidas [shubha987] (http://github.com/shubha987)"//merge conflicts ## Task 2 After all of you send a Pull Request, I'll add my name to 'Entries'. From 523f55d886f55848831caf50f9a9ddb52615fd2f Mon Sep 17 00:00:00 2001 From: Shubha Ruidas Date: Sat, 15 Apr 2023 01:53:49 +0530 Subject: [PATCH 3/4] (TASK-3) Added a dummy code --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 734c108..94c7b91 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Your entry should maintain alphabetic order and it should be in the format: ### Entries -"Shubha Ruidas [shubha987] (http://github.com/shubha987)"//merge conflicts +Shubha Ruidas [shubha987] (http://github.com/shubha987) ## Task 2 After all of you send a Pull Request, I'll add my name to 'Entries'. @@ -35,6 +35,7 @@ After all of you send a Pull Request, I'll add my name to 'Entries'. - Try to merge upstream changes into your downstream repository. You'll get 'merge conflicts'. - [Remove the merge conflicts](https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line) and create another pull request. +print("hello i am an associate development member of developers' society") ## Task 3 From fd89fb508f5fefac4c8c86240d28a322ad458728 Mon Sep 17 00:00:00 2001 From: Shubha Ruidas Date: Sat, 15 Apr 2023 01:56:03 +0530 Subject: [PATCH 4/4] REMOVED STUPID PIECE OF CODE --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 94c7b91..a68d91e 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,6 @@ After all of you send a Pull Request, I'll add my name to 'Entries'. - Configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository. - Try to merge upstream changes into your downstream repository. You'll get 'merge conflicts'. - [Remove the merge conflicts](https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line) and create another pull request. - -print("hello i am an associate development member of developers' society") - ## Task 3 - Create a new branch (called Task3) in your fork. Add a dummy piece of code and push it to the current branch.