Skip to content

Latest commit

 

History

History
19 lines (13 loc) · 875 Bytes

README.md

File metadata and controls

19 lines (13 loc) · 875 Bytes

GeekCamp_FOSS_Task2

In Task 2, You don't have to do anything in Main Branch you have two subtasks: Subtask-1, and Subtask-2.

1)Checkout to Subtask-1 branch

● In the Subtask-1 branch, there is a dialogue.txt file. There you have to write two lines- In first line, your name and enrolment number In second line, your favorite movie dialogue

2)Checkout to Subtask-2 branch

● In the branch named Subtask-2, there is a movie folder. There you have to create a .txt file where you have to write your favorite movie name.

● Now, while doing these tasks, you have to make sure that you solve all the merge conflicts, if any present, & hence you will be asked again & again to do the same.

● Remember, you have to make 2 different PRs, in 2 different branches, and once they are merged, then only your task 2 will be completed.