-
Notifications
You must be signed in to change notification settings - Fork 57
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
issue 1846 - remove the locale parameter of Notification.getLocalizedTexts #3
base: master
Are you sure you want to change the base?
Conversation
Thanks for splitting this change off into a feature branch, that makes things much easier. I see it's based on your master branch, but unfortunately it looks like you did not set your master branch to point to the same commit as the adblockplus/adblockpluscore master branch. That's why the #5504 changes are being included in this pull request. Please could you point your master branch at the same revision as the adblockplus/adblockpluscore master branch and then rebase your 1846-remove-locale-param branch on top of that. Hopefully then the correct change(s) will be listed in this pull request. |
I tried, bit it didn't let me. I tried git branch -f master , git reset --hard... and others, but it didnt let me. so I set it to the commit in my fork. What command would you use for that? |
adblockpluscore git:(master) ✗ git branch -f master 78a11e7 |
You need to add a new remote repository https://github.com/adblockplus/adblockpluscore to your local clone of it using something like |
I just had a go with your fork and I had to do something like this:
|
(Oh, I just noiced Sergz already beat me to it 👍.) |
It's well worth spending the time learning some about how Git works, it's a bit boring but it makes this stuff much easier. I found this free ebook pretty helpful https://git-scm.com/book/en/v2 |
Thanks!!! yeah, no harm improving on that. |
OK, check the new one, I think it's fine... |
Another trial :)
Hope we're close.
Let me know what you think, sorry for the time it takes