conflicts resolved

vineethkuttan · vineethkuttan · commit 967d1598275f · 2025-10-29T11:04:28.000+05:30
diff --git a/vnext/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ShadowNode.cpp b/vnext/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ShadowNode.cpp
@@ -163,7 +163,7 @@ std::shared_ptr<ShadowNode> ShadowNode::clone(
   }
 }
 
-ContextContainer::Shared ShadowNode::getContextContainer() const {
+std::shared_ptr<const ContextContainer> ShadowNode::getContextContainer() const {
   return family_->componentDescriptor_.getContextContainer();
 }
 
diff --git a/vnext/overrides.json b/vnext/overrides.json
@@ -206,6 +206,13 @@
       "baseHash": "74cee7804fa62964c9ecc3fafd475d09b0ed6375",
       "issue": 15263
     },
+    {
+      "type": "patch",
+      "file": "ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ShadowNode.cpp",
+      "baseFile": "packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp",
+      "baseHash": "d0335398782289db2de5b350de24373458180c4d",
+      "issue": 15292
+    },
     {
       "type": "patch",
       "file": "ReactCommon/TEMP_UntilReactCommonUpdate/react/runtime/ReactInstance.cpp",

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ std::shared_ptr<ShadowNode> ShadowNode::clone(`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`-ContextContainer::Shared ShadowNode::getContextContainer() const {`
	`166`	`+std::shared_ptr<const ContextContainer> ShadowNode::getContextContainer() const {`
`167`	`167`	`return family_->componentDescriptor_.getContextContainer();`
`168`	`168`	`}`
`169`	`169`