diff --git a/README.md b/README.md index eb33eea..d755023 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,11 @@ -# Fun With Branches 😉 -Welcome Guys & Gals to the repository, where you will be completing your Task 2️⃣ of FOSS Workshop. -
-
-We have divided the Task 2, into 3️⃣ subtasks, and the points will be awarded accordingly. -
- -## Sub-Task 1 -You will find a folder, named as Subtask-1 in the main branch of this repository. In that folder, you have to create a text file the name of which will be your Github Username. -In that text file, you have to answer the following things : -- Your Full Name -- Your Nick Name (or something, you would like to be known as) -- Your Hometown & Homestate 😂 -- What are you most excited to learn in the APK Month? -- What all societies do you want to be a part of during your 4 years of college life? -- The Course you Hate the Most -- Github Profile URL -- Facebook Profile URL -- Instagram Profile URL - -You will find a sample text file in that folder for your reference. Once you have answered all these ❓, you just have to save the file, and push it to the main branch. - -
- -## Format of Commit Message -``` completed Subtask-1``` -Make sure to use the above format only, while commiting your changes for Subtask-1. - -
- -## What to do after Pushing? -Once you have pushed your changes, make sure to make a PR(Pull Request) in the main branch. Once you have done that, give yourself a pat on your back, for completing Subtask-1, and proceed to the branch Subtask-2, for further instructions. \ No newline at end of file +- Dharavath gopi krishna +- G.k +- kothagudem and telangana +- anything that related to programming +- IIIC +- POM +- https://github.com/GopiKrishnaDharavath +- https://www.facebook.com/dharavath.gopikrishna.715169 +- NO Instagram + \ No newline at end of file diff --git a/subtask-2/abot senoirs.txt b/subtask-2/abot senoirs.txt new file mode 100644 index 0000000..76610de --- /dev/null +++ b/subtask-2/abot senoirs.txt @@ -0,0 +1,2 @@ +- A.R. +He is a kind person and has always helped me \ No newline at end of file diff --git a/subtask-2/merge conflicts.txt b/subtask-2/merge conflicts.txt new file mode 100644 index 0000000..67dff57 --- /dev/null +++ b/subtask-2/merge conflicts.txt @@ -0,0 +1 @@ +merge conflict- subtask-3