Here we describe the procedure to sync this fairchat.ReactNative repo on your machine with the upstream/master branch of the [Rocket.Chat.ReactNative](https://github.com/RocketChat/Rocket.Chat.ReactNative/) project.
Here we describe the procedure to sync this fairchat.ReactNative repo on your machine with the upstream/master branch of the [Rocket.Chat.ReactNative](https://github.com/RocketChat/Rocket.Chat.ReactNative/) project.
The Rocket.Chat.ReactNative upstream/master is the `develop` branch (you have that also locally in your git). It may be merged with the fairchat.ReactNative develop branch, which is `fairchat-master`. Or define a new branch for it like "mergeWith1.2n.x'.
The Rocket.Chat.ReactNative upstream/master is the `develop` branch (you have that also locally in your git). It may be merged with the fairchat.ReactNative develop branch, which is `developFairchat`. Or define a new branch for it like "mergeWith1.2n.x'.
## Sync from the RC upstream master to your local git
## Sync from the RC upstream master to your local git
...
@@ -20,10 +20,11 @@ If upstream is not available yet, add it:
...
@@ -20,10 +20,11 @@ If upstream is not available yet, add it: