Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Japan's Okinawa and Nagoya to the travel guide #51

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Adds Japan's Okinawa and Nagoya to the travel guide #51

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
132dc6d
Added some info about Okinawa
zcemksd Oct 7, 2024
9ba0ebd
New Japan file
zcemksd Oct 7, 2024
6e482d1
Adding Japan to Asia directory
zcemksd Oct 15, 2024
8f4274c
Adding information about Nagoya
zcemksd Oct 15, 2024
5f50bf2
Adding information about Okinawa
zcemksd Oct 15, 2024
6d2cbc1
Deleted a past okinawa file
zcemksd Oct 15, 2024
01bcf1e
Created Japan folder with its corresponding README file and city files
zcemksd Oct 18, 2024
83260ae
Removed files to create folder with new files for Japan cities
zcemksd Oct 18, 2024
1e5ace5
Fixed the files names
zcemksd Oct 19, 2024
61ffa8a
Deleted files
zcemksd Oct 19, 2024
a68c2d0
Fixing merge conflict
zcemksd Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions asia/Japan.md/Nagoya.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Nagoya is has both traditional and ancient castles, but also more modern museums and theme parks. It is now home to Ghibli Park. It is also famous for its Samurai history.

Find out more here: [wikivoyage](https://en.wikivoyage.org/wiki/Nagoya)
3 changes: 3 additions & 0 deletions asia/Japan.md/Okinawa.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Okinawa is an island and one of Japan's 47 prefectures. It has beautiful beaches and coastlines with lots of coral and undersea life It also has castle and ruins to visit.

Find out more here: [wikivoyage](https://en.wikivoyage.org/wiki/Okinawa)
5 changes: 5 additions & 0 deletions asia/Japan.md/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Find out about interesting places to visit in Japan!
[Nagoya](./Nagoya.md)
[Okinawa](./Okinawa.md)

More information about Japan at [wikivoyage](https://en.wikivoyage.org/wiki/Japan) and [wikipedia](https://en.wikipedia.org/wiki/Japan)
1 change: 1 addition & 0 deletions asia/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# ASIA
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

[Japan](./Japan/README.md)