Skip to content

Conversation

@mh-mazen
Copy link
Contributor

@mh-mazen mh-mazen commented Apr 2, 2020

thanks for accepting my request , decided to add my home country as well

Muhammed Mazen Hafez added 4 commits March 21, 2020 23:12
@VictorCazanave
Copy link
Owner

Thanks again @mh-mazen !

Could you resolve the conflicts please? Saudi Arabia has already been added

@mh-mazen
Copy link
Contributor Author

mh-mazen commented Apr 4, 2020

Sorry about that , forgot to pull changes , should be fine now

* 🇪🇸[Spain](packages/spain)
* 🇱🇰[Sri Lanka](packages/sri-lanka)
* 🇸🇪[Sweden](packages/sweden)
* 🇸🇦[Saudi Arabia](packages/saudi-arabia)
Copy link
Owner

Choose a reason for hiding this comment

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

Could you remove all the modifications about Saudi Arabia please? If there is an issue with this map, it would better to fix it in another PR

Copy link
Owner

Choose a reason for hiding this comment

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

Sorry but some files about Saudi Arabia are still modified:

  • README.md: Saudi Arabia has already been added before South Korea
  • packages/saudi-arabia/README.md
  • packages/saudi-arabia/index.js

Could you remove these commits please?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am very sorry for this mistake , can you please advice how to solve this? i can't seem to be able to remove said commits

Copy link
Owner

@VictorCazanave VictorCazanave Apr 7, 2020

Choose a reason for hiding this comment

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

No worries ^^
It looks like the merge after pulling messed up your commits 🤔

I think you can reorganize the commits of your master branch to be synchronized with mine: git checkout master && git rebase -i 906756c1856dfe8b09a5e1de03f46eebc5878a0b (906756c is the last commit before our branches diverge)

Or another more radical solution may be to create a new PR from a clean branch:

  1. Create a new branch from your master branch: git checkout master && git branch syria-map
  2. Hard reset your master branch to mine to be synchronized: git fetch upstream master && git reset --hard upstream/master
  3. Rebase your syria branch to your master branch and eventually edit/remove commits:git checkout syria-map && git rebase -i master
  4. If there are still issues, reset your branch and commit again only the files about Syria: git reset master
  5. Create a new PR from syria-map branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants