From fe160762cb4d2b80112784902b4d2ccf628bae0e Mon Sep 17 00:00:00 2001 From: Website Deployment Script Date: Wed, 7 Aug 2019 03:24:40 +0000 Subject: [PATCH] Deploy website Deploy website version based on 8fa1f39dbc43d324ffc61da0c6bde560b27a30e8 --- docs/next/upgrading.html | 2 +- docs/next/upgrading/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/next/upgrading.html b/docs/next/upgrading.html index 99d5d8b27b0..64173fcc519 100644 --- a/docs/next/upgrading.html +++ b/docs/next/upgrading.html @@ -96,7 +96,7 @@ git commit -m "upgrade RN"
react-native upgrade 0.59.0-rc.0
 

The project is upgraded using git apply with 3-way merge. That's why it may happen you'll need to resolve some conflicts.

-

4. Resolve the conflicts

+

3. Resolve the conflicts

Conflicted files include delimiters which make very clear where the changes come from. For example:

13B07F951A680F5B00A75B9A /* Release */ = {
   isa = XCBuildConfiguration;
diff --git a/docs/next/upgrading/index.html b/docs/next/upgrading/index.html
index 99d5d8b27b0..64173fcc519 100644
--- a/docs/next/upgrading/index.html
+++ b/docs/next/upgrading/index.html
@@ -96,7 +96,7 @@ git commit -m "upgrade RN"
 
react-native upgrade 0.59.0-rc.0
 

The project is upgraded using git apply with 3-way merge. That's why it may happen you'll need to resolve some conflicts.

-

4. Resolve the conflicts

+

3. Resolve the conflicts

Conflicted files include delimiters which make very clear where the changes come from. For example:

13B07F951A680F5B00A75B9A /* Release */ = {
   isa = XCBuildConfiguration;