Fun With Branches 😉

<<<<<<< HEAD <<<<<<< HEAD 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.

Welcome Guys & Gals, to the branch Subtask-2. Here, you will be completing your Subtask-2.

---

Sub-Task 2

In this branch you will find a text file named Subtask-2.txt. In that file, you have to add the following things :

• The initials of your favorite Second Year Senior, mind you, only the initials. ======= Welcome Guys & Gals, to the branch Subtask-3. Here, you will be completing your Subtask-3.

---

Sub-Task 3

In this branch you will find a text file named Subtask-3.txt. In that file, you have to add the following things :

• The initials of your favorite Third Year Senior, mind you, only the initials.

Subtask-3

• 2 reasons why do you like Him or Her

Now while doing this subtask, you will be facing Merge Conflicts, and hence will be asked again & again, to solve merge conflicts, until your PR is merged.
Also, you can find some sample entries in the text file for your Reference. <<<<<<< HEAD

Subtask-2 ======= Subtask-3

---

Format of Commit Message

<<<<<<< HEAD <<<<<<< HEAD <Github_username> 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.

<Github_username> completed Subtask-2
Make sure to use the above format only, while commiting your changes for Subtask-2.

---

What to do after your PR is merged?

Once your PR is merged, give yourself another pat on your back, for completing Subtask-2, and proceed to the branch Subtask-3, for further instructions.

Subtask-2 ======= <Github_username> completed Subtask-3
Make sure to use the above format only, while commiting your changes for Subtask-3.

---

What to do after your PR is merged?

A very hearty congratulations 🥳 to you, for completing the 3rd Subtask, and with that the Task 2 of FOSS Workshop.

---

Next Steps

Here, is a link to a Repository, which is maintained and constantly updated by the Co-ordinator of FOSS Wing, Ritik Harchani himself.
Here, you will find the links to some of the best online courses, on a diverse variety of topics, which you can avail for free.
So, all the best Guys & Gals and,
HAPPY LEARNING

Subtask-3