-
Notifications
You must be signed in to change notification settings - Fork 133
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
lang: [nl] Add Dutch Languages #691
Conversation
Added the Dutch languages
Hello, thanks for the PR. We have failure in PHPCSFixer, can you run the following command to fix the error? composer cs-fix tests/Language/AbstractTranslationTestCase |
Added the translation for line 64
Update coding standards
@snelledre Please see #672 (comment) |
Updated dutch coding standard
Sorry, I will try again today to update the previous one as well, but unfortunately I can't at the moment verify the other ones. |
Best, I have seen how to commit all the changes but I get errors see below witch the execution off: Executing: git commit --amend --no-edit --no-verify -S
[detached HEAD 1795958] chore: configure Psalm
Author: kenjis <kenji.uui@gmail.com>
Date: Wed Apr 20 09:43:59 2022 +0900
2 files changed, 24 insertions(+)
create mode 100644 psalm_autoload.php
Auto-merging src/Controllers/RegisterController.php
CONFLICT (content): Merge conflict in src/Controllers/RegisterController.php
error: could not apply 1a046d5... refactor: fix psalm errors
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1a046d5... refactor: fix psalm errors |
It seems your PR branch is a bit out of dated. Try first:
|
Sorry, but that didn't help the output stays the same. |
Do you mean the same error message? I got your PR branch and tried and got:
I think you will get the same message. Your branch has a merge commit, so |
It seems you are a very beginner of Git. Starting again new PR might be easier than solving your current issue. If you create a new PR, I recommend you create a new branch for the PR, |
@snelledre Starting anything is a bit difficult, if you are not familiar with it, it becomes more difficult. Your situation in this PR has existed for all of us one day, like me confused, ambiguous and 🏋️ You are not the first person in this situation and you will not be the last 🐍 The conflict and difficulties of these PR can make you interested in learning new topics such as git, github cli ,phpunit test and... think positive 🦾 As @kenjis' said before, if you don't succeed, just create a new PR. |
If you don't know how to use git, I recommend you try https://learngitbranching.js.org/ |
Added the Dutch languages