Help with merge conflicts between next and update-next-2.14

[zFernand0]

ℹ️ We still have to create a merge commit (i.e. Click the Update Branch), even if we decide to merge this PR ℹ️

Proposed changes

Resolve merge conflicts

Release Notes

Milestone: N/A

Changelog: N/A

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

• Bugfix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

• I have read the CONTRIBUTOR GUIDANCE wiki
• PR title follows Conventional Commits Guidelines
• PR Description is included
• gif or screenshot is included if visual changes are made
• yarn workspace vscode-extension-for-zowe vscode:prepublish has been executed
• All checks have passed (DCO, Jenkins and Code Coverage)
• I have added unit test and it is passing
• I have added integration test and it is passing
• There is coverage for the code that I have added
• I have tested it manually and there are no regressions found
• I have added necessary documentation (if appropriate)
• Any PR dependencies have been merged and published (if appropriate)

Further comments

[sonarcloud]

Quality Gate passed

Issues
9 New issues

Measures
0 Security Hotspots
No data about Coverage
2.0% Duplication on New Code

See analysis details on SonarCloud

[codecov]

Codecov Report

Attention: 21 lines in your changes are missing coverage. Please review.

Comparison is base (cef104a) 93.22% compared to head (76a99cc) 93.22%.

Files	Patch %	Lines
packages/zowe-explorer/src/dataset/actions.ts	92.74%	9 Missing ⚠️
...-explorer-api/src/profiles/ZoweExplorerZosmfApi.ts	97.53%	4 Missing ⚠️
packages/zowe-explorer-api/src/utils/Poller.ts	33.33%	2 Missing ⚠️
packages/zowe-explorer/src/Profiles.ts	91.30%	2 Missing ⚠️
...ges/zowe-explorer/src/abstract/ZoweTreeProvider.ts	71.42%	2 Missing ⚠️
...kages/zowe-explorer/src/dataset/ZoweDatasetNode.ts	92.85%	1 Missing ⚠️
packages/zowe-explorer/src/globals.ts	50.00%	1 Missing ⚠️

Additional details and impacted files

@@                Coverage Diff                @@
##           update-next-2.14    #2708   +/-   ##
=================================================
  Coverage             93.22%   93.22%           
=================================================
  Files                   106      109    +3     
  Lines                 10247    10262   +15     
  Branches               2210     2216    +6     
=================================================
+ Hits                   9553     9567   +14     
- Misses                  693      694    +1     
  Partials                  1        1           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[zFernand0]

I'll be merging this PR since it does not require any reviews to be merged.

The purpose of this was to resolve all merge conflicts between next and update-next-2.14.

Having a single commit makes it easy to revert in the event that something goes wrong.

Also, this PR helps prove that the resolution to the merge conflicts to not cause any problems.

Seeing the Codecov reports side by side may help to reassure the status of this PR.

CodeCov from #2690	Codecov from this PR

[zFernand0]

Since commit history is not kept, GH will still flag all merge conflicts as if they never happened.

Hence, I reverted this PR.

Apologies for the confusion.

I'll apply the same changes directly on the update-next-2.14 branch