You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: KeepingRecent.md
+11-11Lines changed: 11 additions & 11 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -5,28 +5,28 @@ We aim to keep this forked repository as up to date as possible with [Facebook's
5
5
6
6
## Merging a New Version of React Native
7
7
1. Create a reference to a remote to Facebook's repo
8
-
1.1. In terminal: `git remote add facebook https://github.com/facebook/react-native.git`
9
-
1.2. In terminal: `cd react-native/; git pull facebook`
8
+
1. In terminal: `git remote add facebook https://github.com/facebook/react-native.git`
9
+
2. In terminal: `cd react-native/; git pull facebook`
10
10
2. Create a branch to work in. Below is for merging in Facebook's React Native 0.58 version.
11
-
2.1. In terminal: e.g. `git branch fb58merge`
12
-
2.2. In terminal: e.g. `git checkout fb58merge`
11
+
1. In terminal: e.g. `git branch fb58merge`
12
+
2. In terminal: e.g. `git checkout fb58merge`
13
13
3. Pull the fb contents at the merge point we want. A list of their most recent versions can be found [here](https://facebook.github.io/react-native/versions).
14
-
3.1. In terminal: e.g. `git fetch facebook v0.58.6`
14
+
1. In terminal: e.g. `git fetch facebook v0.58.6`
15
15
4. Do the merge at the point we want, in this example it's the last version tag of their 0.58 build. Use the name you used in 3.1 here.
16
-
4.1. In terminal: e.g. `git merge v0.58.6`
16
+
1. In terminal: e.g. `git merge v0.58.6`
17
17
18
18
## Integration Guidelines
19
19
It's likely you'll want to push the initial merge up to github **with** the merge conflicts. This makes it easier for other people to see where the errors are and help fix their platforms quickly.
20
20
21
21
1. Commit all the changes (conflicts and all). There are many resources to do this such as the [Visual Studio Code](https://code.visualstudio.com/) UI or command line.
22
22
2. After you've committed all the changes, push your merge up.
23
-
2.1. In terminal: `git push`. This should fail to push, but print out a suggested `git push [more repo specifics here]` command.
24
-
2.2. Copy and run that suggested push command which has the proper upstream repo specified.
23
+
1. In terminal: `git push`. This should fail to push, but print out a suggested `git push [more repo specifics here]` command.
24
+
2. Copy and run that suggested push command which has the proper upstream repo specified.
25
25
26
26
#### First Time Merging? Read Below. Otherwise this shouldn't apply to you.
27
27
3. The first time doing this, terminal may ask for your github credentials after running the `git push` command from 2.2. You'll need to provide your github username and a 2-Factor-Authentication token password. If you don't have this yet, see substeps below. <em>Github doesn't distinguish when you need to use your github password vs. this 2FA token, but for command line github interactions, you'll need to use the token.</em>
28
-
3.1. Generate your personal access token [here](https://github.com/settings/tokens)
29
-
3.2. More details [here](https://stackoverflow.com/questions/29297154/github-invalid-username-or-password)
28
+
1. Generate your personal access token [here](https://github.com/settings/tokens)
29
+
2. More details [here](https://stackoverflow.com/questions/29297154/github-invalid-username-or-password)
30
30
31
31
## Best Practices
32
32
* Before pulling in a new React-Native version, verify with platform owners that they're ready to work on the merge.
@@ -37,4 +37,4 @@ It's likely you'll want to push the initial merge up to github **with** the merg
37
37
* Android- acoates-ms
38
38
* iOS- HeyImChris/tom-un
39
39
* Mac- HeyImChris/tom-un
40
-
* Make sure you're pulling in a **stable**[release candidate](https://facebook.github.io/react-native/versions).
40
+
* Make sure you're pulling in a **stable**[release candidate](https://facebook.github.io/react-native/versions).
0 commit comments