1. Learn
    2. /
  2. Courses
    3. /
  3. Intermediate Git
Connected

Exercise

Resolving a merge conflict

You are in the main branch, and want to merge your recent edits from the documentation branch.

Instructions 1/2

undefined XP
  • 1
    • Merge the documentation branch into your current branch, main.
  • 2
    • Edit task_list.txt, removing the conflict syntax and saving so it contains the content listed in the Context section; the final document should look like this:
    TODO: Add unit tests
TODO: Increase font size on courses pages