Skip to content

Commit f12841d

Browse files
authored
fix up some minor spacing issues with the numbering indentations (#213)
1 parent ef7415f commit f12841d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

KeepingRecent.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ We aim to keep this forked repository as up to date as possible with [Facebook's
55

66
## Merging a New Version of React Native
77
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`
1010
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`
1313
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`
1515
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`
1717

1818
## Integration Guidelines
1919
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.
2020

2121
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.
2222
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.
2525

2626
#### First Time Merging? Read Below. Otherwise this shouldn't apply to you.
2727
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)
3030

3131
## Best Practices
3232
* 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
3737
* Android- acoates-ms
3838
* iOS- HeyImChris/tom-un
3939
* 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

Comments
 (0)