search

Project-OSRM / osrm-text-instructions

Text instructions from OSRM route responses
BSD 2-Clause "Simplified" License
86 stars 60 forks source link

Add Persian (Iran) language #301

Open Mahdi-Farhani opened 3 years ago

akashihi commented 3 years ago

@Mahdi-Farhani Looks nice! The only thing i'm concerned - are those version changes in package-lock.json relevant? Looks like you are updating version of the package itself, but you do downgrade some dependencies. Is there any reason for that?

Mahdi-Farhani commented 3 years ago

@Mahdi-Farhani Looks nice! The only thing i'm concerned - are those version changes in package-lock.json relevant? Looks like you are updating version of the package itself, but you do downgrade some dependencies. Is there any reason for that?

Hi, I do not change anything and I don't know why the package-lock is changed. You can Ignore these changes.

akashihi commented 3 years ago

@Mahdi-Farhani I'm afraid i can't remove file from the PR, but you can.

Mahdi-Farhani commented 3 years ago

@Mahdi-Farhani I'm afraid i can't remove file from the PR, but you can.

done

akashihi commented 3 years ago

@Mahdi-Farhani Sorry for delay :) Well, you are committing file removal, not removing the file from commit. I think you should go back and cancel that change completely.

I can't guarantee, that it will work for you, but you could try following:

git rebase -i HEAD~3

an editor will open. For the last commit, that deletes the file, replace pick with d and for the middle commit replace pick with e Save the file then and close the editor.

You should be editing the middle commit now. Please issue the following commands: git reset --soft HEAD~1 git reset HEAD package-lock.json git commit -c ORIG_HEAD
git rebase --continue

This should remove the 'package-lock.json' file from you PR and then you can do a force push.

yuryleb commented 3 years ago

@Mahdi-Farhani, just commit original package-lock.json file from master branch and it will be "removed" from your PR.