search

bcgov / namerequest

Public Front End for the Name Request System
1 stars 42 forks source link

Quick fix to prevent Applicant Last Name only contains spaces (8214) #436

Closed eve-git closed 3 years ago

eve-git commented 3 years ago

Issue #: /bcgov/entity#8214

Description of changes:

  1. First Name, Middle Name and Last Name: trim spaces and combine multiple continuous spaces to one
  2. First Name is optional
  3. Last Name keeps required

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).

eve-git commented 3 years ago

@severinbeauvais I could not save the fix of the conflict until I click the merge button. Can you do it? There are the version conflict. Please use my change. Thanks

severinbeauvais commented 3 years ago

@severinbeauvais I could not save the fix of the conflict until I click the merge button. Can you do it? There are the version conflict. Please use my change. Thanks

You should be able to fix the conflicts yourself...

  1. click on "Resolve conflicts" button
  2. edit the files so they look correct (delete the <<< and >>> and keep only your new code)
  3. click "Mark as resolved" button
  4. I think this will then save a merge commit, and then you should be good to go
eve-git commented 3 years ago

"Mark as resolved" does not save the change results until click "Commit Merge" button.