Skip to content

Commit 54b3784

Browse files
committed
docs(en): merging all conflicts
2 parents c1127ef + 3b02f82 commit 54b3784

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

src/content/learn/react-developer-tools.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,23 @@ react-devtools
5454

5555
![React Developer Tools standalone](/images/docs/react-devtools-standalone.png)
5656

57+
<<<<<<< HEAD
5758
## 移动端(React Native) {/*mobile-react-native*/}
5859
React 开发者工具同样可检查用 [React Native](https://reactnative.dev/) 构建的应用程序。
5960

6061
使用 React 开发者工具最简单的办法就是全局安装它:
6162
```bash
6263
# Yarn
6364
yarn global add react-devtools
65+
=======
66+
## Mobile (React Native) {/*mobile-react-native*/}
6467

65-
# Npm
66-
npm install -g react-devtools
67-
```
68+
To inspect apps built with [React Native](https://reactnative.dev/), you can use [React Native DevTools](https://reactnative.dev/docs/debugging/react-native-devtools), the built-in debugger that deeply integrates React Developer Tools. All features work identically to the browser extension, including native element highlighting and selection.
69+
>>>>>>> 3b02f828ff2a4f9d2846f077e442b8a405e2eb04
70+
71+
[Learn more about debugging in React Native.](https://reactnative.dev/docs/debugging)
6872

73+
<<<<<<< HEAD
6974
接下来从终端打开开发者工具:
7075
```bash
7176
react-devtools
@@ -76,3 +81,6 @@ react-devtools
7681
> 如果几秒钟后开发者工具未连接,请尝试重新加载应用程序。
7782

7883
[了解有关调试 React Native 的更多信息](https://reactnative.dev/docs/debugging)。
84+
=======
85+
> For versions of React Native earlier than 0.76, please use the standalone build of React DevTools by following the [Safari and other browsers](#safari-and-other-browsers) guide above.
86+
>>>>>>> 3b02f828ff2a4f9d2846f077e442b8a405e2eb04

0 commit comments

Comments
 (0)