Note
Once the instructor has created the scenario for conflicts to happen and has asked you to go ahead with this task, do not sync your fork. Check the develop branch of your fork is 1 commit behind the develop branch of the original repo. Then just go ahead with the task below.
Task description
- Go to section 1 of the readme inside @your-github-username-here/github-ui folder
- Change the text from "Watch this video" to "Just watch this video"
- Merge the conflict
- Add a comment in you pull request to let instructor know that your pull request is ready for review when you are done
Note
After you have sent a pull request for the above task, do not sync your fork. Check that the develop branch of your fork is still 1 commit behind the develop branch of the original repo. Then just go ahead to create another branch from develop and work on issue #97 immediately.