search

bcgov / business-create-ui

BC Registry Services - Legal Entities - Create Incorporation Application
Apache License 2.0
7 stars 47 forks source link

19034 Rebasing legal name feature branch #637

Closed JazzarKarim closed 7 months ago

JazzarKarim commented 8 months ago

Issue #: /bcgov/entity#19034

Description of changes: Rebased the legal name feature branch with main

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

JazzarKarim commented 8 months ago

/gcbrun

bcregistry-sre commented 8 months ago

Temporary Url for review: https://business-create-dev--pr-637-v17badd4.web.app

severinbeauvais commented 8 months ago

That's too many files to review. Are these just the commits from main branch since they diverged? If so then I propose that they don't need to be reviewed.

On the other hand, if there were merge conflicts then some files should be reviewed. LMK

JazzarKarim commented 8 months ago

That's too many files to review. Are these just the commits from main branch since they diverged? If so then I propose that they don't need to be reviewed.

On the other hand, if there were merge conflicts then some files should be reviewed. LMK

Yes, most of them are just commits that came from the main branch. No need to review any of those.

Sev, the files that I think can be reviewed (major merge conflicts) are:

Other than that, it was small conflicts that I'm pretty sure it should be OK (I resolved all thoroughly).

severinbeauvais commented 7 months ago

I have reviewed the following files and I trust the other ones to be OK.

JazzarKarim commented 7 months ago

I have reviewed the following files and I trust the other ones to be OK.

  • [x] App.vue
  • [x] BreadcrumbResource.ts
  • [x] EntityInfo.vue
  • [x] business-interface.ts
  • [ ] ~FetchConfig.ts~ not in diff; did you mean "src/utils/feature-flag-utils.ts"?

Thank you Sev! I think the feature flag utils file is OK. No conflicts there. Never mind then the FetchConfig.ts file.

severinbeauvais commented 7 months ago

@JazzarKarim What's the game plan for new PRs on main branch? Do they need to be duplicated for the legal name branch?

JazzarKarim commented 7 months ago

@JazzarKarim What's the game plan for new PRs on main branch? Do they need to be duplicated for the legal name branch?

I think Argus mentioned that we'll be rebasing every week or every sprint so that the branch doesn't fall behind a lot again. @argush3 Please correct me if I'm wrong or missed anything.