Update how to sync repos authored by Roland Alton's avatar Roland Alton
This is the procedure to sync this fairchat.ReactNative repo on your machine with the upstream/master branch of the [Rocket.Chat.ReactNative] 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.
(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`.
Open Terminal. Open Terminal.
...@@ -54,7 +55,7 @@ Instead of merging, we may want to rebase so that we have a new master with all ...@@ -54,7 +55,7 @@ Instead of merging, we may want to rebase so that we have a new master with all
> git checkout fairchat-master > git checkout fairchat-master
> git rebase upstream/master > git rebase upstream/master
Now you solve the merge conflicts e.g. using Gitkraken. Now you solve the merge conflicts e.g. using `mergetools` .
Build the app. Build the app.
... ...
......