Implement Task-3 Branching Strategy and Conflict Resolution Protocol

[sarthakvermaa]

Merge Conflict Meltdown Mission

Task 1

This task comprises the following steps.

Step 1

• Checkout to the Task-3 branch.
• Create a text file named <github-username>.txt. For example, if your GitHub username is sarthakvermaa, the file name should be sarthakvermaa.txt.
• Write your name on the first line of the file.
• Commit these changes.

Step 2

• Create a new branch named feature (and switch to it) from the Task-3 branch.
• Specify two things about yourself on lines 2 and 3 of the file.
• Commit these changes.

Step 3

• Return to the Task-3 branch.
• Write your 2-3 favourite food you like to eat, i.e., on lines 2 and 3.
• Commit these changes.

Final step

• Merge the changes from the feature branch into the Task-3 branch.

Upon completing this task, ensure you have precisely 4 commits, and the data entered in both steps 2 & 3 persists in the file. Push these changes and create a PR.

---