Skip to content

fix: resolve merge conflicts of 1342#2064

Open
maithili20 wants to merge 2 commits intoOneCommunityGlobal:developmentfrom
maithili20:maithili-test-merge-1342
Open

fix: resolve merge conflicts of 1342#2064
maithili20 wants to merge 2 commits intoOneCommunityGlobal:developmentfrom
maithili20:maithili-test-merge-1342

Conversation

@maithili20
Copy link

Description

This is a new PR covering the feedback and solving conflicts on PR1342

Fixes # (bug list priority high/medium/low x.y.z)
Or Implements # (WBS)

Related PRS (if any):

This frontend PR is related to the #XXX backend PR.
To test this backend PR you need to checkout the #XXX frontend PR.

Main changes explained:

  • Delete file A for removing unused components …
  • Update file B for including new pattern …
  • Create file C for introducing new components …

How to test:

  1. check into current branch
  2. do npm install and ... to run this PR locally
  3. Clear site data/cache
  4. log as admin user
  5. go to dashboard→ Tasks→ task→…
  6. verify function “A” (feel free to include screenshot here)

Screenshots or videos of changes:

Note:

Include the information the reviewers need to know.

@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
E Security Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant