-
Notifications
You must be signed in to change notification settings - Fork 189
Add Map of Syria #29
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.
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
base: master
Are you sure you want to change the base?
Add Map of Syria #29
Conversation
- Update files details according to the pull request
|
Thanks again @mh-mazen ! Could you resolve the conflicts please? Saudi Arabia has already been added |
|
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) |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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:
- Create a new branch from your master branch:
git checkout master && git branch syria-map - Hard reset your master branch to mine to be synchronized:
git fetch upstream master && git reset --hard upstream/master - Rebase your syria branch to your master branch and eventually edit/remove commits:
git checkout syria-map && git rebase -i master - If there are still issues, reset your branch and commit again only the files about Syria:
git reset master - Create a new PR from
syria-mapbranch
da10c5a to
4309a09
Compare
thanks for accepting my request , decided to add my home country as well