Skip to content

Promote83#15986

Closed
protikbiswas100 wants to merge 13 commits intomainfrom
promote83
Closed

Promote83#15986
protikbiswas100 wants to merge 13 commits intomainfrom
promote83

Conversation

@protikbiswas100
Copy link
Copy Markdown
Contributor

@protikbiswas100 protikbiswas100 commented Apr 14, 2026

Description

Type of Change

Erase all that don't apply.

  • Bug fix (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)
  • This change requires a documentation update
  • Automation (AI changes or Github Actions to reduce effort of manual tasks)

Why

What is the motivation for this change? Add a few sentences describing the context and overall goals of the pull request's commits.

Resolves [Add Relevant Issue Here]

What

What changes were made to the codebase to solve the bug, add the functionality, etc. that you specified above.

Screenshots

Add any relevant screen captures here from before or after your changes.

Testing

If you added tests that prove your changes are effective or that your feature works, add a few sentences here detailing the added test scenarios.

Optional: Describe the tests that you ran locally to verify your changes.

Changelog

Should this change be included in the release notes: indicate yes or no

Add a brief summary of the change to use in the release notes for the next release.

Microsoft Reviewers: Open in CodeFlow

protikbiswas100 and others added 10 commits March 19, 2026 11:38
* fixing compilation error

* adding package.lock.json files

* removing IntersectionObserverIndex from RNTester file

* removing IntersectionObserver

* Revert 'removing IntersectionObserver' and 'removing IntersectionObserverIndex from RNTester file'

* adding IntersectionObserver from upstream

* adding packages.lock.json file chnages

* Change files

* adding package.lock.json files
* cherry pick

* Add package.lock.json

* update snapshots

---------

Co-authored-by: Harini Malothu <hmalothu@microsoft.com>
Co-authored-by: Vineeth <66076509+vineethkuttan@users.noreply.github.com>
Co-authored-by: React-Native-Windows Bot <53619745+rnbot@users.noreply.github.com>
@protikbiswas100 protikbiswas100 requested review from a team as code owners April 14, 2026 07:04
@protikbiswas100
Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	.ado/jobs/cli-init-windows.yml
#	.ado/jobs/desktop.yml
#	.ado/jobs/setup.yml
#	.ado/jobs/universal.yml
#	CONTRIBUTING.md
#	packages/@office-iss/react-native-win32-tester/overrides.json
#	packages/@office-iss/react-native-win32-tester/package.json
#	packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js
#	packages/@office-iss/react-native-win32/CHANGELOG.json
#	packages/@office-iss/react-native-win32/CHANGELOG.md
#	packages/@office-iss/react-native-win32/overrides.json
#	packages/@office-iss/react-native-win32/package.json
#	packages/@react-native-windows/automation-channel/CHANGELOG.json
#	packages/@react-native-windows/automation-channel/CHANGELOG.md
#	packages/@react-native-windows/automation-channel/package.json
#	packages/@react-native-windows/automation-commands/CHANGELOG.json
#	packages/@react-native-windows/automation-commands/CHANGELOG.md
#	packages/@react-native-windows/automation-commands/package.json
#	packages/@react-native-windows/automation/CHANGELOG.json
#	packages/@react-native-windows/automation/CHANGELOG.md
#	packages/@react-native-windows/automation/package.json
#	packages/@react-native-windows/cli/CHANGELOG.json
#	packages/@react-native-windows/cli/CHANGELOG.md
#	packages/@react-native-windows/cli/package.json
#	packages/@react-native-windows/codegen/CHANGELOG.json
#	packages/@react-native-windows/codegen/CHANGELOG.md
#	packages/@react-native-windows/codegen/package.json
#	packages/@react-native-windows/find-repo-root/CHANGELOG.json
#	packages/@react-native-windows/find-repo-root/CHANGELOG.md
#	packages/@react-native-windows/find-repo-root/package.json
#	packages/@react-native-windows/fs/CHANGELOG.json
#	packages/@react-native-windows/fs/CHANGELOG.md
#	packages/@react-native-windows/fs/package.json
#	packages/@react-native-windows/package-utils/CHANGELOG.json
#	packages/@react-native-windows/package-utils/CHANGELOG.md
#	packages/@react-native-windows/package-utils/package.json
#	packages/@react-native-windows/perf-testing/CHANGELOG.json
#	packages/@react-native-windows/perf-testing/CHANGELOG.md
#	packages/@react-native-windows/perf-testing/package.json
#	packages/@react-native-windows/telemetry/CHANGELOG.json
#	packages/@react-native-windows/telemetry/CHANGELOG.md
#	packages/@react-native-windows/telemetry/package.json
#	packages/@react-native-windows/tester/overrides.json
#	packages/@react-native-windows/tester/package.json
#	packages/@react-native-windows/tester/src/js/examples-win/Pointer/PointerButtonExample.windows.js
#	packages/@react-native-windows/tester/src/js/utils/RNTesterList.windows.js
#	packages/@react-native/monorepo/overrides.json
#	packages/@react-native/monorepo/package.json
#	packages/@react-native/tester/js/examples/IntersectionObserver/IntersectionObserverClippingParent.js
#	packages/@react-native/tester/js/examples/IntersectionObserver/IntersectionObserverClippingRoot.js
#	packages/@react-native/tester/js/utils/RNTesterList.android.js
#	packages/@react-native/tester/overrides.json
#	packages/@react-native/tester/package.json
#	packages/@rnw-scripts/babel-react-native-config/package.json
#	packages/@rnw-scripts/beachball-config/package.json
#	packages/@rnw-scripts/create-github-releases/package.json
#	packages/@rnw-scripts/doxysaurus/package.json
#	packages/@rnw-scripts/eslint-config/package.json
#	packages/@rnw-scripts/integrate-rn/package.json
#	packages/@rnw-scripts/metro-dev-config/package.json
#	packages/@rnw-scripts/prepare-release/package.json
#	packages/@rnw-scripts/promote-release/package.json
#	packages/@rnw-scripts/stamp-version/package.json
#	packages/@rnw-scripts/take-screenshot/package.json
#	packages/debug-test/package.json
#	packages/e2e-test-app-fabric/package.json
#	packages/e2e-test-app-fabric/test/__snapshots__/HomeUIADump.test.ts.snap
#	packages/e2e-test-app-fabric/test/__snapshots__/snapshotPages.test.js.snap
#	packages/playground/package.json
#	packages/playground/windows/playground-composition.sln
#	packages/react-native-platform-override/CHANGELOG.json
#	packages/react-native-platform-override/CHANGELOG.md
#	packages/react-native-platform-override/package.json
#	packages/react-native-windows-init/CHANGELOG.json
#	packages/react-native-windows-init/CHANGELOG.md
#	packages/react-native-windows-init/package.json
#	packages/sample-app-fabric/package.json
#	packages/sample-custom-component/package.json
#	vnext/CHANGELOG.json
#	vnext/CHANGELOG.md
#	vnext/PropertySheets/Generated/PackageVersion.g.props
#	vnext/Shared/Shared.vcxitems
#	vnext/overrides.json
#	vnext/package.json
#	yarn.lock

Co-authored-by: protikbiswas100 <219775028+protikbiswas100@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 14, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 271644d. Here's a summary of how the conflicts were resolved:

  • ADO pipeline files (desktop.yml, setup.yml, universal.yml): Accepted main's deletion since these were restructured in main
  • package.json files (34 files): Used main's canary version numbers
  • CHANGELOG.json files (14 files): Merged both — 0.83 entries are prepended before the canary entries
  • CHANGELOG.md files (14 files): Same approach — 0.83 entries appear before canary entries
  • overrides.json files (6 files): Used main's version (baseVersion must match main's React Native nightly)
  • Other files: Resolved case-by-case (ADO YAML, snapshots, JS/TS tester lists, SLN configs)

@protikbiswas100
Copy link
Copy Markdown
Contributor Author

/azp run PR

@azure-pipelines
Copy link
Copy Markdown
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@vineethkuttan
Copy link
Copy Markdown
Contributor

Closing this not needed

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.

4 participants