Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,11 @@
# Fun With Branches 😉
Welcome Guys & Gals to the repository, where you will be completing your Task 2️⃣ of FOSS Workshop.
<br>
<br>
We have divided the Task 2, into 3️⃣ subtasks, and the points will be awarded accordingly.

<hr>

## Sub-Task 1
You will find a folder, named as <i>Subtask-1</i> in the <b>main</b> branch of this repository. In that folder, you have to create a text file the name of which will be your <b>Github Username</b>.
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 <b>main</b> branch.

<hr>

## Format of Commit Message
```<Github_username> completed Subtask-1```
Make sure to use the above format only, while commiting your changes for Subtask-1.

<hr>

## 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 <b>Subtask-2</b>, for further instructions.
- 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

2 changes: 2 additions & 0 deletions subtask-2/abot senoirs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- A.R.
He is a kind person and has always helped me
1 change: 1 addition & 0 deletions subtask-2/merge conflicts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
merge conflict- subtask-3