- Issue created by @quietone
- 🇺🇸United States smustgrave
Almost renamed it to unlucky 13. But updated issue as appears 13 words vs 12 were changed.
Reviewing those changes though replacements seem good
- 🇬🇧United Kingdom longwave UK
A couple of nits where we could avoid ignoring words.
- 🇳🇿New Zealand quietone
@longwave, thanks.
I've made changes for the feedback and tests are passing.
The Needs Review Queue Bot → tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".
This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.
Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.
- 🇳🇿New Zealand quietone
Rebase with conflict in node.module because of the conversion of hook_help.
The Needs Review Queue Bot → tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".
This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.
Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.
- First commit to issue fork.
- 🇮🇳India akulsaxena
@quietone
I fixed the merge error/conflicts so that the MR becomes mergeable, but as soon as the merge conflicts were resolved, phpstan and PHPCS pipelines are failing. Please take a look - 🇳🇿New Zealand quietone
@akulsaxena, thanks for working on this. I looked at the MR and there has been a mistake with the merge. What I noticed is that there shouldn't be any changes to the file
node.module
, although there could be other mistakes as well.If it were me I would revert the merge and start over. You may want to read the recommended way to rebase a merge request → in Drupal. You can also ask in #contribute in Drupal Slack for help.
- 🇮🇳India akulsaxena
@quietone
I reverted the changes I made.
The branch is now 81 commits behind source branch and needs a rebase - 🇳🇿New Zealand quietone
@akulsaxena, thanks. Do you want to do the rebase?
- 🇮🇳India akulsaxena
@quietone
I'm currently tied up with something and wont be able to get to this right now. It would be great if someone else could take this on and handle the rebase. - 🇳🇿New Zealand quietone
@akulsaxena, thanks for letting us know you are busy and for reverting the merge.
Rebased and rebuild the dictionary to confirm it was not changed.
- 🇮🇳India akulsaxena
@quietone
Thank you for working on the rebase
The rebase seems to work fine, there seem to be no merge conflicts on the MR and all the tests are passing. - 🇺🇸United States nicxvan
Looks good, words removed from cspell.
Individual file exceptions were added where necessary.
- 🇮🇳India akulsaxena
Rebased and cleared the merge conflicts
Solving the Merge conflict caused Sorting error (PHPUnit Test Failure)
Sorted the words in dictionary.txt correctly