Branching and Merging- Not without Conflicts!

[shauryaaa100]

Steps to solve this task:

• Create a folder named 'Task-2'. The name should be exactly same as this. If it already exists, no need to create it.
• In the Task-2 folder, add a .txt file named after your github username. Example- shauryaaa100.txt
• In that file, write your favorite actor's name in line 1. Commit this change.
• Create a new branch called 'Task2', and checkout to that branch.
• In the file you had created, add 2 hit films of the actor in lines 2 and 3. Commit this change.
• Checkout to main branch, and add 2 flop films of the actor in lines 2 and 3. Commit this change.
• Take a screenshot of the previous 3 commits. You can use git log or git log --oneline.
• Now, merge the 'Task2' branch into the main branch.
• There will be a merge conflict. Take a screenshot of this merge conflict.
• Resolve the merge conflict. Take a screenshot of the commit resolving the merge conflict.
• Push the changes and create a Pull Request.

The Pull Request must contain 3 screenshots, 1 for the initial 3 commits, 1 showing the merge conflict, and the 3rd one showing the commit where the merge conflict has been resolved.

This issue is open for all, so no need to claim it. Just submit your PR.
Note that the file should contain the flop as well as the hit films after resolution of the conflict.

[shauryaaa100]

Note that the file should contain the flop as well as the hit films after resolution of the conflict.