Adds Japan's Okinawa and Nagoya to the travel guide

[zcemksd]

Answers UCL-COMP0233-24-25/RSE-Classwork#3

[dpshelio]

Almost there!
Remember, files should be .md files, country files need to be called README.md inside their country folder, whereas the cities should be city_name.md and saved into a country folder: asia/japan/

[krishnakumarg1984]

Note that the country name folders should not end in md. Only the individual files are to have filenames that end with the .md extension.

Also note that as per our project's convention, the entire filename for the cities should be in lowercase.

[krishnakumarg1984]

Nice work. Well done.

[krishnakumarg1984]

Looks like we have merge conflicts. Shall be happy to merge the PR once the conflicts are resolved.

[krishnakumarg1984]

Please read my inline comments on the conflicting file that provides further guidance on resolving merge conflicts.

[krishnakumarg1984]

I think this file will result in a merge conflict. This is because, in the main repository, there exist other entries already. So, please review the merge conflict exercise (UCL-COMP0233-24-25/RSE-Classwork#4). I shall provide you an outline of the steps here, but it is critical for you to understand these steps considering that merge conflicts are quite common and will likely be encountered often in class exercises as well as in assignments.

• Sync the updates to the main branch of upstream with the main branch of your fork. You may do this from GitHub's UI on your fork repo.
• Pull down the synced (i.e. updated) main branch to your local machine
• Switch to your zcemksd:karol_travel branch locally
• Attempt to merge the changes that are in main e.g. by issuing git merge main (remember you should be on your branch before you run this command). A merge conflict will occur for this README.md.
• Locate the conflict resolution markers on the README.md and make sure you edit the file to incorporate the Japan line either in alphabetical sort order or towards the end of the list already there. Remove the conflict markers, and make sure that all the existing lines are there along with the Japan line added by you.
• Then commit these changes and complete the merge.
• Push up the updated files to GitHub.
• Request a review again (but only after you are sure that it is correctly done).

Feel free to book an office hour slot during the week with any of the instructors or the helpers if you are still stuck. Resolving merge conflicts is an important part of working with git and GitHub in projects.